whitespace (mostly wrapping long lines produced by protoize)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19278 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/krb/mk_cred.c b/src/lib/krb5/krb/mk_cred.c
index 04248c08d1ed09167e8cd18b2c8353e32e0f859c..cb446471781cb23f29ce219a42dd38b5f22dc939 100644 (file)
--- a/src/lib/krb5/krb/mk_cred.c
+++ b/src/lib/krb5/krb/mk_cred.c
@@ -21,7 +21,8 @@
  * encrypt the enc_part of krb5_cred
  */
 static krb5_error_code 
-encrypt_credencpart(krb5_context context, krb5_cred_enc_part *pcredpart, krb5_keyblock *pkeyblock, krb5_enc_data *pencdata)
+encrypt_credencpart(krb5_context context, krb5_cred_enc_part *pcredpart,
+                   krb5_keyblock *pkeyblock, krb5_enc_data *pencdata)
 {
     krb5_error_code      retval;
     krb5_data          * scratch;
@@ -62,7 +63,11 @@ encrypt_credencpart(krb5_context context, krb5_cred_enc_part *pcredpart, krb5_ke
 /*----------------------- krb5_mk_ncred_basic -----------------------*/
 
 static krb5_error_code
-krb5_mk_ncred_basic(krb5_context context, krb5_creds **ppcreds, krb5_int32 nppcreds, krb5_keyblock *keyblock, krb5_replay_data *replaydata, krb5_address *local_addr, krb5_address *remote_addr, krb5_cred *pcred)
+krb5_mk_ncred_basic(krb5_context context,
+                   krb5_creds **ppcreds, krb5_int32 nppcreds,
+                   krb5_keyblock *keyblock, krb5_replay_data *replaydata,
+                   krb5_address *local_addr, krb5_address *remote_addr,
+                   krb5_cred *pcred)
 {
     krb5_cred_enc_part           credenc;
     krb5_error_code      retval;
@@ -145,7 +150,9 @@ cleanup:
  * outputs an encoded KRB_CRED message suitable for krb5_rd_cred
  */
 krb5_error_code KRB5_CALLCONV
-krb5_mk_ncred(krb5_context context, krb5_auth_context auth_context, krb5_creds **ppcreds, krb5_data **ppdata, krb5_replay_data *outdata)
+krb5_mk_ncred(krb5_context context, krb5_auth_context auth_context,
+             krb5_creds **ppcreds, krb5_data **ppdata,
+             krb5_replay_data *outdata)
 {
     krb5_address * premote_fulladdr = NULL;
     krb5_address * plocal_fulladdr = NULL;
@@ -286,7 +293,9 @@ error:
  * A convenience function that calls krb5_mk_ncred.
  */
 krb5_error_code KRB5_CALLCONV
-krb5_mk_1cred(krb5_context context, krb5_auth_context auth_context, krb5_creds *pcreds, krb5_data **ppdata, krb5_replay_data *outdata)
+krb5_mk_1cred(krb5_context context, krb5_auth_context auth_context,
+             krb5_creds *pcreds, krb5_data **ppdata,
+             krb5_replay_data *outdata)
 {
     krb5_error_code retval;
     krb5_creds **ppcreds;

diff --git a/src/lib/krb5/krb/mk_error.c b/src/lib/krb5/krb/mk_error.c
index 0444a5d17ce6f7f39da23c0f64450bcbe20a6d6d..819d29dde15351120161679ccbfeefe108a02f4d 100644 (file)
--- a/src/lib/krb5/krb/mk_error.c
+++ b/src/lib/krb5/krb/mk_error.c
@@ -38,7 +38,8 @@
  returns system errors
  */
 krb5_error_code KRB5_CALLCONV
-krb5_mk_error(krb5_context context, const krb5_error *dec_err, krb5_data *enc_err)
+krb5_mk_error(krb5_context context, const krb5_error *dec_err,
+             krb5_data *enc_err)
 {
     krb5_error_code retval;
     krb5_data *new_enc_err;

diff --git a/src/lib/krb5/krb/mk_priv.c b/src/lib/krb5/krb/mk_priv.c
index efe254ac090ac2242be6f396111b2803fb1ae86b..08cbee969a05f5d73f030c3bc15bba09dda749c6 100644 (file)
--- a/src/lib/krb5/krb/mk_priv.c
+++ b/src/lib/krb5/krb/mk_priv.c
@@ -32,7 +32,10 @@
 #include "auth_con.h"
 
 static krb5_error_code
-krb5_mk_priv_basic(krb5_context context, const krb5_data *userdata, const krb5_keyblock *keyblock, krb5_replay_data *replaydata, krb5_address *local_addr, krb5_address *remote_addr, krb5_pointer i_vector, krb5_data *outbuf)
+krb5_mk_priv_basic(krb5_context context, const krb5_data *userdata,
+                  const krb5_keyblock *keyblock, krb5_replay_data *replaydata,
+                  krb5_address *local_addr, krb5_address *remote_addr,
+                  krb5_pointer i_vector, krb5_data *outbuf)
 {
     krb5_error_code    retval;
     krb5_priv          privmsg;

diff --git a/src/lib/krb5/krb/mk_rep.c b/src/lib/krb5/krb/mk_rep.c
index 393f634bb1652dd0efbc0d645c06fd1c1fcc1c11..b512f097529757dc19bb0c2f67f563d1dc477623 100644 (file)
--- a/src/lib/krb5/krb/mk_rep.c
+++ b/src/lib/krb5/krb/mk_rep.c
@@ -40,7 +40,8 @@
 */
 
 krb5_error_code KRB5_CALLCONV
-krb5_mk_rep(krb5_context context, krb5_auth_context auth_context, krb5_data *outbuf)
+krb5_mk_rep(krb5_context context, krb5_auth_context auth_context,
+           krb5_data *outbuf)
 {
     krb5_error_code      retval;
     krb5_ap_rep_enc_part  repl;

diff --git a/src/lib/krb5/krb/mk_req_ext.c b/src/lib/krb5/krb/mk_req_ext.c
index e5cb43a5285fb73a915a432d93115edf3e2a9d6f..6d40e5de7a415d32da9ff7572cc961cbd755ede7 100644 (file)
--- a/src/lib/krb5/krb/mk_req_ext.c
+++ b/src/lib/krb5/krb/mk_req_ext.c
@@ -258,7 +258,10 @@ cleanup:
 }
 
 static krb5_error_code
-krb5_generate_authenticator(krb5_context context, krb5_authenticator *authent, krb5_principal client, krb5_checksum *cksum, krb5_keyblock *key, krb5_ui_4 seq_number, krb5_authdata **authorization)
+krb5_generate_authenticator(krb5_context context, krb5_authenticator *authent,
+                           krb5_principal client, krb5_checksum *cksum,
+                           krb5_keyblock *key, krb5_ui_4 seq_number,
+                           krb5_authdata **authorization)
 {
     krb5_error_code retval;
     

diff --git a/src/lib/krb5/krb/mk_safe.c b/src/lib/krb5/krb/mk_safe.c
index eefcab7cd473d2233b3ef0da6af6de511b469980..0517f42750baa43d72462a7afd7c117303e3d112 100644 (file)
--- a/src/lib/krb5/krb/mk_safe.c
+++ b/src/lib/krb5/krb/mk_safe.c
@@ -110,7 +110,9 @@ cleanup_checksum:
 }
 
 krb5_error_code KRB5_CALLCONV
-krb5_mk_safe(krb5_context context, krb5_auth_context auth_context, const krb5_data *userdata, krb5_data *outbuf, krb5_replay_data *outdata)
+krb5_mk_safe(krb5_context context, krb5_auth_context auth_context,
+            const krb5_data *userdata, krb5_data *outbuf,
+            krb5_replay_data *outdata)
 {
     krb5_error_code      retval;
     krb5_keyblock       * keyblock;

diff --git a/src/lib/krb5/krb/rd_cred.c b/src/lib/krb5/krb/rd_cred.c
index a29eb052229ec7a920306cb6b5e4899c57b035d0..965ed9a8154208a6092ea4ba05d5e5e4008c29eb 100644 (file)
--- a/src/lib/krb5/krb/rd_cred.c
+++ b/src/lib/krb5/krb/rd_cred.c
@@ -12,7 +12,8 @@
  * decrypt the enc_part of a krb5_cred
  */
 static krb5_error_code 
-decrypt_credencdata(krb5_context context, krb5_cred *pcred, krb5_keyblock *pkeyblock, krb5_cred_enc_part *pcredenc)
+decrypt_credencdata(krb5_context context, krb5_cred *pcred,
+                   krb5_keyblock *pkeyblock, krb5_cred_enc_part *pcredenc)
 {
     krb5_cred_enc_part  * ppart = NULL;
     krb5_error_code      retval;
@@ -51,7 +52,9 @@ cleanup:
 /*----------------------- krb5_rd_cred_basic -----------------------*/
 
 static krb5_error_code 
-krb5_rd_cred_basic(krb5_context context, krb5_data *pcreddata, krb5_keyblock *pkeyblock, krb5_replay_data *replaydata, krb5_creds ***pppcreds)
+krb5_rd_cred_basic(krb5_context context, krb5_data *pcreddata,
+                  krb5_keyblock *pkeyblock, krb5_replay_data *replaydata,
+                  krb5_creds ***pppcreds)
 {
     krb5_error_code       retval;
     krb5_cred          * pcred;
@@ -162,7 +165,9 @@ cleanup_cred:
  * outputs the nonce and an array of the forwarded credentials.
  */
 krb5_error_code KRB5_CALLCONV
-krb5_rd_cred(krb5_context context, krb5_auth_context auth_context, krb5_data *pcreddata, krb5_creds ***pppcreds, krb5_replay_data *outdata)
+krb5_rd_cred(krb5_context context, krb5_auth_context auth_context,
+            krb5_data *pcreddata, krb5_creds ***pppcreds,
+            krb5_replay_data *outdata)
 {
     krb5_error_code       retval;
     krb5_keyblock       * keyblock;
@@ -183,19 +188,20 @@ krb5_rd_cred(krb5_context context, krb5_auth_context auth_context, krb5_data *pc
         return KRB5_RC_REQUIRED;
 
 
-/* If decrypting with the first keyblock we try fails, perhaps the
- * credentials are stored in the session key so try decrypting with
-    * that.
-*/
+    /*
+     * If decrypting with the first keyblock we try fails, perhaps the
+     * credentials are stored in the session key so try decrypting with
+     * that.
+     */
     if ((retval = krb5_rd_cred_basic(context, pcreddata, keyblock,
                                     &replaydata, pppcreds))) {
        if ((retval = krb5_rd_cred_basic(context, pcreddata,
                                         auth_context->keyblock,
                                         &replaydata, pppcreds))) {
            return retval;
+       }
     }
-    }
-    
+
     if (auth_context->auth_context_flags & KRB5_AUTH_CONTEXT_DO_TIME) {
         krb5_donot_replay replay;
         krb5_timestamp currenttime;

diff --git a/src/lib/krb5/krb/rd_error.c b/src/lib/krb5/krb/rd_error.c
index e81727c7ca29524f4174ad078c7db4688d372fa5..2c617154b03fd377cd3b3ebbbac1b4391af04986 100644 (file)
--- a/src/lib/krb5/krb/rd_error.c
+++ b/src/lib/krb5/krb/rd_error.c
@@ -40,7 +40,8 @@
  */
 
 krb5_error_code KRB5_CALLCONV
-krb5_rd_error(krb5_context context, const krb5_data *enc_errbuf, krb5_error **dec_error)
+krb5_rd_error(krb5_context context, const krb5_data *enc_errbuf,
+             krb5_error **dec_error)
 {
     if (!krb5_is_krb_error(enc_errbuf))
        return KRB5KRB_AP_ERR_MSG_TYPE;

diff --git a/src/lib/krb5/krb/rd_priv.c b/src/lib/krb5/krb/rd_priv.c
index cf74807793944ab0b09fa472c563d751ea24bcda..1e4a0e79a9b3d31c5e2cd8d130d1f455c9848b0c 100644 (file)
--- a/src/lib/krb5/krb/rd_priv.c
+++ b/src/lib/krb5/krb/rd_priv.c
@@ -55,7 +55,11 @@ Returns system errors, integrity errors.
 */
 
 static krb5_error_code
-krb5_rd_priv_basic(krb5_context context, const krb5_data *inbuf, const krb5_keyblock *keyblock, const krb5_address *local_addr, const krb5_address *remote_addr, krb5_pointer i_vector, krb5_replay_data *replaydata, krb5_data *outbuf)
+krb5_rd_priv_basic(krb5_context context, const krb5_data *inbuf,
+                  const krb5_keyblock *keyblock,
+                  const krb5_address *local_addr,
+                  const krb5_address *remote_addr, krb5_pointer i_vector,
+                  krb5_replay_data *replaydata, krb5_data *outbuf)
 {
     krb5_error_code      retval;
     krb5_priv          * privmsg;
@@ -149,7 +153,9 @@ cleanup_privmsg:;
 }
 
 krb5_error_code KRB5_CALLCONV
-krb5_rd_priv(krb5_context context, krb5_auth_context auth_context, const krb5_data *inbuf, krb5_data *outbuf, krb5_replay_data *outdata)
+krb5_rd_priv(krb5_context context, krb5_auth_context auth_context,
+            const krb5_data *inbuf, krb5_data *outbuf,
+            krb5_replay_data *outdata)
 {
     krb5_error_code      retval;
     krb5_keyblock       * keyblock;

diff --git a/src/lib/krb5/krb/rd_rep.c b/src/lib/krb5/krb/rd_rep.c
index 6742d8a0388fc7646f3af11a5173afa2fed1ebaf..901de4338a928c95c2163c5881fa745c69b60b3e 100644 (file)
--- a/src/lib/krb5/krb/rd_rep.c
+++ b/src/lib/krb5/krb/rd_rep.c
@@ -42,7 +42,8 @@
  */
 
 krb5_error_code KRB5_CALLCONV
-krb5_rd_rep(krb5_context context, krb5_auth_context auth_context, const krb5_data *inbuf, krb5_ap_rep_enc_part **repl)
+krb5_rd_rep(krb5_context context, krb5_auth_context auth_context,
+           const krb5_data *inbuf, krb5_ap_rep_enc_part **repl)
 {
     krb5_error_code      retval;
     krb5_ap_rep        * reply;

diff --git a/src/lib/krb5/krb/rd_req.c b/src/lib/krb5/krb/rd_req.c
index 9a2f4589d7f12b779f04f5fb2313fef06fc8fc2b..28f4f93641be22eab2c8fc9c97ec8e4fcada37a7 100644 (file)
--- a/src/lib/krb5/krb/rd_req.c
+++ b/src/lib/krb5/krb/rd_req.c
@@ -46,14 +46,10 @@
  */
 
 krb5_error_code KRB5_CALLCONV
-krb5_rd_req(krb5_context context, krb5_auth_context *auth_context, const krb5_data *inbuf, krb5_const_principal server, krb5_keytab keytab, krb5_flags *ap_req_options, krb5_ticket **ticket)
-                                 
-                                     
-                                
-                                       /* XXX do we really need this */
-                                        
-                                         
-                                  
+krb5_rd_req(krb5_context context, krb5_auth_context *auth_context,
+           const krb5_data *inbuf, krb5_const_principal server,
+           krb5_keytab keytab, krb5_flags *ap_req_options,
+           krb5_ticket **ticket)
 {
     krb5_error_code      retval;
     krb5_ap_req        * request;
@@ -85,9 +81,11 @@ krb5_rd_req(krb5_context context, krb5_auth_context *auth_context, const krb5_da
     /* Get an rcache if necessary. */
     if (((*auth_context)->rcache == NULL)
        && ((*auth_context)->auth_context_flags & KRB5_AUTH_CONTEXT_DO_TIME)
-&& server) {
+       && server) {
        if ((retval = krb5_get_server_rcache(context,
-     krb5_princ_component(context,server,0), &(*auth_context)->rcache)))
+                                            krb5_princ_component(context,
+                                                                 server,0),
+                                            &(*auth_context)->rcache)))
            goto cleanup_auth_context;
     }
 

diff --git a/src/lib/krb5/krb/rd_req_dec.c b/src/lib/krb5/krb/rd_req_dec.c
index 6f53b11c95d16fb7d132f140588a3a36560f1972..a2b275cbef7617e1806794418b00857967f73077 100644 (file)
--- a/src/lib/krb5/krb/rd_req_dec.c
+++ b/src/lib/krb5/krb/rd_req_dec.c
@@ -61,12 +61,13 @@
 
 static krb5_error_code decrypt_authenticator
        (krb5_context, const krb5_ap_req *, krb5_authenticator **,
-                  int);
+        int);
 
 #define in_clock_skew(date) (labs((date)-currenttime) < context->clockskew)
 
 static krb5_error_code
-krb5_rd_req_decrypt_tkt_part(krb5_context context, const krb5_ap_req *req, krb5_keytab keytab)
+krb5_rd_req_decrypt_tkt_part(krb5_context context, const krb5_ap_req *req,
+                            krb5_keytab keytab)
 {
     krb5_error_code      retval;
     krb5_enctype         enctype;

diff --git a/src/lib/krb5/krb/rd_safe.c b/src/lib/krb5/krb/rd_safe.c
index 15dc6dcccd6923fad9831826e567f6c4f6a72cb5..758f9cf9a1534f0dd84b463901bcb20c2aea0463 100644 (file)
--- a/src/lib/krb5/krb/rd_safe.c
+++ b/src/lib/krb5/krb/rd_safe.c
@@ -47,7 +47,11 @@
  returns system errors, integrity errors
  */
 static krb5_error_code
-krb5_rd_safe_basic(krb5_context context, const krb5_data *inbuf, const krb5_keyblock *keyblock, const krb5_address *recv_addr, const krb5_address *sender_addr, krb5_replay_data *replaydata, krb5_data *outbuf)
+krb5_rd_safe_basic(krb5_context context, const krb5_data *inbuf,
+                  const krb5_keyblock *keyblock,
+                  const krb5_address *recv_addr,
+                  const krb5_address *sender_addr,
+                  krb5_replay_data *replaydata, krb5_data *outbuf)
 {
     krb5_error_code      retval;
     krb5_safe          * message;
@@ -154,7 +158,9 @@ cleanup:
 }
 
 krb5_error_code KRB5_CALLCONV
-krb5_rd_safe(krb5_context context, krb5_auth_context auth_context, const krb5_data *inbuf, krb5_data *outbuf, krb5_replay_data *outdata)
+krb5_rd_safe(krb5_context context, krb5_auth_context auth_context,
+            const krb5_data *inbuf, krb5_data *outbuf,
+            krb5_replay_data *outdata)
 {
     krb5_error_code      retval;
     krb5_keyblock      * keyblock;