svn rev #23467: trunk/src/lib/krb5/ krb/ os/

[tsitkova@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23467
Commit By: tsitkova
Log Message:
Formatining  enhancement



Changed Files:
U   trunk/src/lib/krb5/krb/vfy_increds.c
U   trunk/src/lib/krb5/os/read_pwd.c
Modified: trunk/src/lib/krb5/krb/vfy_increds.c
===================================================================
--- trunk/src/lib/krb5/krb/vfy_increds.c	2009-12-15 14:57:14 UTC (rev 23466)
+++ trunk/src/lib/krb5/krb/vfy_increds.c	2009-12-15 16:37:00 UTC (rev 23467)
@@ -3,7 +3,8 @@
 #include "int-proto.h"
 
 static krb5_error_code
-krb5_cc_copy_creds_except(krb5_context context, krb5_ccache incc, krb5_ccache outcc, krb5_principal princ)
+copy_creds_except(krb5_context context, krb5_ccache incc,
+                  krb5_ccache outcc, krb5_principal princ)
 {
     krb5_error_code code;
     krb5_flags flags;
@@ -117,8 +118,7 @@
         } else if (krb5_libdefault_boolean(context,
                                            &creds->client->realm,
                                            KRB5_CONF_VERIFY_AP_REQ_NOFAIL,
-                                           &nofail)
-                   == 0) {
+                                           &nofail) == 0) {
             if (nofail)
                 goto cleanup;
         }
@@ -129,8 +129,9 @@
 
     krb5_kt_free_entry(context, &kte);
 
-    /* If the creds are for the server principal, we're set, just do
-       a mk_req.  Otherwise, do a get_credentials first. */
+    /* If the creds are for the server principal, we're set, just do a mk_req.
+     * Otherwise, do a get_credentials first.
+     */
 
     if (krb5_principal_compare(context, server, creds->server)) {
         /* make an ap_req */
@@ -199,21 +200,22 @@
 
             if ((ret = krb5_cc_resolve(context, "MEMORY:rd_req2", &retcc)) ||
                 (ret = krb5_cc_initialize(context, retcc, creds->client)) ||
-                (ret = krb5_cc_copy_creds_except(context, ccache, retcc,
-                                                 creds->server))) {
+                (ret = copy_creds_except(context, ccache, retcc,
+                                         creds->server))) {
                 if (retcc)
                     krb5_cc_destroy(context, retcc);
             } else {
                 *ccache_arg = retcc;
             }
         } else {
-            ret = krb5_cc_copy_creds_except(context, ccache, *ccache_arg,
-                                            server);
+            ret = copy_creds_except(context, ccache, *ccache_arg,
+                                    server);
         }
     }
 
-    /* if any of the above paths returned an errors, then ret is set
-       accordingly.  either that, or it's zero, which is fine, too */
+    /* if any of the above paths returned an errors, then ret is set accordingly.
+     * Either that, or it's zero, which is fine, too
+     */
 
 cleanup:
     if ( server)

Modified: trunk/src/lib/krb5/os/read_pwd.c
===================================================================
--- trunk/src/lib/krb5/os/read_pwd.c	2009-12-15 14:57:14 UTC (rev 23466)
+++ trunk/src/lib/krb5/os/read_pwd.c	2009-12-15 16:37:00 UTC (rev 23467)
@@ -42,7 +42,9 @@
 #endif /* ECHO_PASSWORD */
 
 krb5_error_code
-krb5_read_password(krb5_context context, const char *prompt, const char *prompt2, char *return_pwd, unsigned int *size_return)
+krb5_read_password(krb5_context context,
+                   const char *prompt, const char *prompt2,
+                   char *return_pwd, unsigned int *size_return)
 {
     krb5_data reply_data;
     krb5_prompt k5prompt;
@@ -117,12 +119,11 @@
 
 #ifdef _WIN32
 static krb5_error_code
-read_console_password(
-    krb5_context        context,
-    const char          * prompt,
-    const char          * prompt2,
-    char                * password,
-    int                 * pwsize)
+read_console_password(krb5_context        context,
+                      const char          * prompt,
+                      const char          * prompt2,
+                      char                * password,
+                      int                 * pwsize)
 {
     HANDLE              handle;
     DWORD               old_mode, new_mode;