Reindent and manually restore some BSD-style files that were

previously incorrectly marked as krb5-style.

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

diff --git a/src/kadmin/cli/strftime.c b/src/kadmin/cli/strftime.c
index 6fb621e41173554be02f3f33e9932f4f1d4e9015..382a209b7756c5b4e17dd43c202112d9bd074494 100644 (file)
--- a/src/kadmin/cli/strftime.c
+++ b/src/kadmin/cli/strftime.c
@@ -1,3 +1,4 @@
+/* -*- mode: c; c-file-style: "bsd"; indent-tabs-mode: t -*- */
 /*     $NetBSD: strftime.c,v 1.8 1999/02/07 17:33:30 augustss Exp $    */
 
 /*

diff --git a/src/kadmin/server/ipropd_svc.c b/src/kadmin/server/ipropd_svc.c
index 127a5045d2527dbebed576c7bdfb835950cc14c7..28c91a819fb98b0c35c9b0332d76a952470e9419 100644 (file)
--- a/src/kadmin/server/ipropd_svc.c
+++ b/src/kadmin/server/ipropd_svc.c
@@ -1,3 +1,4 @@
+/* -*- mode: c; c-file-style: "bsd"; indent-tabs-mode: t -*- */
 /*
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.

diff --git a/src/kadmin/server/kadm_rpc_svc.c b/src/kadmin/server/kadm_rpc_svc.c
index 9b556e92539621697a56a9f0416c74863e419361..76df26e79b9457b92675d5fbd79fbc858518fa80 100644 (file)
--- a/src/kadmin/server/kadm_rpc_svc.c
+++ b/src/kadmin/server/kadm_rpc_svc.c
@@ -1,3 +1,4 @@
+/* -*- mode: c; c-file-style: "bsd"; indent-tabs-mode: t -*- */
 /*
  * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved.
  *
@@ -36,7 +37,7 @@ static int check_rpcsec_auth(struct svc_req *);
  *     rqstp               (input) rpc request structure
  *     transp              (input) rpc transport structure
  *     (input/output)
- *     <return value>
+ *     <return value>
  *
  * Requires:
  * Effects:

diff --git a/src/lib/kadm5/admin_xdr.h b/src/lib/kadm5/admin_xdr.h
index cff22e733f640db8d20bea3ee7ad93695b40d0ec..b1d4f166d5a4857200746c22f7692277ad333825 100644 (file)
--- a/src/lib/kadm5/admin_xdr.h
+++ b/src/lib/kadm5/admin_xdr.h
@@ -1,3 +1,4 @@
+/* -*- mode: c; c-file-style: "bsd"; indent-tabs-mode: t -*- */
 /*
  * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved
  *

diff --git a/src/lib/kadm5/clnt/client_rpc.c b/src/lib/kadm5/clnt/client_rpc.c
index 752206b170c461a6fd1897dd83c3046b387c5680..184f154fca5df24530ca430408c807210cdee1fc 100644 (file)
--- a/src/lib/kadm5/clnt/client_rpc.c
+++ b/src/lib/kadm5/clnt/client_rpc.c
@@ -1,4 +1,4 @@
-/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* -*- mode: c; c-file-style: "bsd"; indent-tabs-mode: t -*- */
 #include <gssrpc/rpc.h>
 #include <kadm5/kadm_rpc.h>
 #include <krb5.h>
@@ -15,314 +15,314 @@ static struct timeval TIMEOUT = { 120, 0 };
 generic_ret *
 create_principal_2(cprinc_arg *argp, CLIENT *clnt)
 {
-    static generic_ret clnt_res;
-
-    memset(&clnt_res, 0, sizeof(clnt_res));
-    if (clnt_call(clnt, CREATE_PRINCIPAL,
-                  (xdrproc_t) xdr_cprinc_arg, (caddr_t) argp,
-                  (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
-                  TIMEOUT) != RPC_SUCCESS) {
-        return (NULL);
-    }
-    return (&clnt_res);
+       static generic_ret clnt_res;
+
+       memset(&clnt_res, 0, sizeof(clnt_res));
+       if (clnt_call(clnt, CREATE_PRINCIPAL,
+                     (xdrproc_t) xdr_cprinc_arg, (caddr_t) argp,
+                     (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
+                     TIMEOUT) != RPC_SUCCESS) {
+               return (NULL);
+       }
+       return (&clnt_res);
 }
 
 generic_ret *
 create_principal3_2(cprinc3_arg *argp, CLIENT *clnt)
 {
-    static generic_ret clnt_res;
-
-    memset(&clnt_res, 0, sizeof(clnt_res));
-    if (clnt_call(clnt, CREATE_PRINCIPAL3,
-                  (xdrproc_t) xdr_cprinc3_arg, (caddr_t) argp,
-                  (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
-                  TIMEOUT) != RPC_SUCCESS) {
-        return (NULL);
-    }
-    return (&clnt_res);
+       static generic_ret clnt_res;
+
+       memset(&clnt_res, 0, sizeof(clnt_res));
+       if (clnt_call(clnt, CREATE_PRINCIPAL3,
+                     (xdrproc_t) xdr_cprinc3_arg, (caddr_t) argp,
+                     (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
+                     TIMEOUT) != RPC_SUCCESS) {
+               return (NULL);
+       }
+       return (&clnt_res);
 }
 
 generic_ret *
 delete_principal_2(dprinc_arg *argp, CLIENT *clnt)
 {
-    static generic_ret clnt_res;
-
-    memset(&clnt_res, 0, sizeof(clnt_res));
-    if (clnt_call(clnt, DELETE_PRINCIPAL,
-                  (xdrproc_t) xdr_dprinc_arg, (caddr_t) argp,
-                  (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
-                  TIMEOUT) != RPC_SUCCESS) {
-        return (NULL);
-    }
-    return (&clnt_res);
+       static generic_ret clnt_res;
+
+       memset(&clnt_res, 0, sizeof(clnt_res));
+       if (clnt_call(clnt, DELETE_PRINCIPAL,
+                     (xdrproc_t) xdr_dprinc_arg, (caddr_t) argp,
+                     (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
+                     TIMEOUT) != RPC_SUCCESS) {
+               return (NULL);
+       }
+       return (&clnt_res);
 }
 
 generic_ret *
 modify_principal_2(mprinc_arg *argp, CLIENT *clnt)
 {
-    static generic_ret clnt_res;
-
-    memset(&clnt_res, 0, sizeof(clnt_res));
-    if (clnt_call(clnt, MODIFY_PRINCIPAL,
-                  (xdrproc_t) xdr_mprinc_arg, (caddr_t) argp,
-                  (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
-                  TIMEOUT) != RPC_SUCCESS) {
-        return (NULL);
-    }
-    return (&clnt_res);
+       static generic_ret clnt_res;
+
+       memset(&clnt_res, 0, sizeof(clnt_res));
+       if (clnt_call(clnt, MODIFY_PRINCIPAL,
+                     (xdrproc_t) xdr_mprinc_arg, (caddr_t) argp,
+                     (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
+                     TIMEOUT) != RPC_SUCCESS) {
+               return (NULL);
+       }
+       return (&clnt_res);
 }
 
 generic_ret *
 rename_principal_2(rprinc_arg *argp, CLIENT *clnt)
 {
-    static generic_ret clnt_res;
-
-    memset(&clnt_res, 0, sizeof(clnt_res));
-    if (clnt_call(clnt, RENAME_PRINCIPAL,
-                  (xdrproc_t) xdr_rprinc_arg, (caddr_t) argp,
-                  (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
-                  TIMEOUT) != RPC_SUCCESS) {
-        return (NULL);
-    }
-    return (&clnt_res);
+       static generic_ret clnt_res;
+
+       memset(&clnt_res, 0, sizeof(clnt_res));
+       if (clnt_call(clnt, RENAME_PRINCIPAL,
+                     (xdrproc_t) xdr_rprinc_arg, (caddr_t) argp,
+                     (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
+                     TIMEOUT) != RPC_SUCCESS) {
+               return (NULL);
+       }
+       return (&clnt_res);
 }
 
 gprinc_ret *
 get_principal_2(gprinc_arg *argp, CLIENT *clnt)
 {
-    static gprinc_ret clnt_res;
-
-    memset(&clnt_res, 0, sizeof(clnt_res));
-    if (clnt_call(clnt, GET_PRINCIPAL,
-                  (xdrproc_t) xdr_gprinc_arg, (caddr_t) argp,
-                  (xdrproc_t) xdr_gprinc_ret, (caddr_t) &clnt_res,
-                  TIMEOUT) != RPC_SUCCESS) {
-        return (NULL);
-    }
-    return (&clnt_res);
+       static gprinc_ret clnt_res;
+
+       memset(&clnt_res, 0, sizeof(clnt_res));
+       if (clnt_call(clnt, GET_PRINCIPAL,
+                     (xdrproc_t) xdr_gprinc_arg, (caddr_t) argp,
+                     (xdrproc_t) xdr_gprinc_ret, (caddr_t) &clnt_res,
+                     TIMEOUT) != RPC_SUCCESS) {
+               return (NULL);
+       }
+       return (&clnt_res);
 }
 
 gprincs_ret *
 get_princs_2(gprincs_arg *argp, CLIENT *clnt)
 {
-    static gprincs_ret clnt_res;
-
-    memset(&clnt_res, 0, sizeof(clnt_res));
-    if (clnt_call(clnt, GET_PRINCS,
-                  (xdrproc_t) xdr_gprincs_arg, (caddr_t) argp,
-                  (xdrproc_t) xdr_gprincs_ret, (caddr_t) &clnt_res,
-                  TIMEOUT) != RPC_SUCCESS) {
-        return (NULL);
-    }
-    return (&clnt_res);
+       static gprincs_ret clnt_res;
+
+       memset(&clnt_res, 0, sizeof(clnt_res));
+       if (clnt_call(clnt, GET_PRINCS,
+                     (xdrproc_t) xdr_gprincs_arg, (caddr_t) argp,
+                     (xdrproc_t) xdr_gprincs_ret, (caddr_t) &clnt_res,
+                     TIMEOUT) != RPC_SUCCESS) {
+            return (NULL);
+       }
+       return (&clnt_res);
 }
 
 generic_ret *
 chpass_principal_2(chpass_arg *argp, CLIENT *clnt)
 {
-    static generic_ret clnt_res;
-
-    memset(&clnt_res, 0, sizeof(clnt_res));
-    if (clnt_call(clnt, CHPASS_PRINCIPAL,
-                  (xdrproc_t) xdr_chpass_arg, (caddr_t) argp,
-                  (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
-                  TIMEOUT) != RPC_SUCCESS) {
-        return (NULL);
-    }
-    return (&clnt_res);
+       static generic_ret clnt_res;
+
+       memset(&clnt_res, 0, sizeof(clnt_res));
+       if (clnt_call(clnt, CHPASS_PRINCIPAL,
+                     (xdrproc_t) xdr_chpass_arg, (caddr_t) argp,
+                     (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
+                     TIMEOUT) != RPC_SUCCESS) {
+               return (NULL);
+       }
+       return (&clnt_res);
 }
 
 generic_ret *
 chpass_principal3_2(chpass3_arg *argp, CLIENT *clnt)
 {
-    static generic_ret clnt_res;
-
-    memset(&clnt_res, 0, sizeof(clnt_res));
-    if (clnt_call(clnt, CHPASS_PRINCIPAL3,
-                  (xdrproc_t) xdr_chpass3_arg, (caddr_t) argp,
-                  (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
-                  TIMEOUT) != RPC_SUCCESS) {
-        return (NULL);
-    }
-    return (&clnt_res);
+       static generic_ret clnt_res;
+
+       memset(&clnt_res, 0, sizeof(clnt_res));
+       if (clnt_call(clnt, CHPASS_PRINCIPAL3,
+                     (xdrproc_t) xdr_chpass3_arg, (caddr_t) argp,
+                     (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
+                     TIMEOUT) != RPC_SUCCESS) {
+               return (NULL);
+       }
+       return (&clnt_res);
 }
 
 generic_ret *
 setv4key_principal_2(setv4key_arg *argp, CLIENT *clnt)
 {
-    static generic_ret clnt_res;
-
-    memset(&clnt_res, 0, sizeof(clnt_res));
-    if (clnt_call(clnt, SETV4KEY_PRINCIPAL,
-                  (xdrproc_t) xdr_setv4key_arg, (caddr_t) argp,
-                  (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
-                  TIMEOUT) != RPC_SUCCESS) {
-        return (NULL);
-    }
-    return (&clnt_res);
+       static generic_ret clnt_res;
+
+       memset(&clnt_res, 0, sizeof(clnt_res));
+       if (clnt_call(clnt, SETV4KEY_PRINCIPAL,
+                     (xdrproc_t) xdr_setv4key_arg, (caddr_t) argp,
+                     (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
+                     TIMEOUT) != RPC_SUCCESS) {
+               return (NULL);
+       }
+       return (&clnt_res);
 }
 
 generic_ret *
 setkey_principal_2(setkey_arg *argp, CLIENT *clnt)
 {
-    static generic_ret clnt_res;
-
-    memset(&clnt_res, 0, sizeof(clnt_res));
-    if (clnt_call(clnt, SETKEY_PRINCIPAL,
-                  (xdrproc_t) xdr_setkey_arg, (caddr_t) argp,
-                  (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
-                  TIMEOUT) != RPC_SUCCESS) {
-        return (NULL);
-    }
-    return (&clnt_res);
+       static generic_ret clnt_res;
+
+       memset(&clnt_res, 0, sizeof(clnt_res));
+       if (clnt_call(clnt, SETKEY_PRINCIPAL,
+                     (xdrproc_t) xdr_setkey_arg, (caddr_t) argp,
+                     (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
+                     TIMEOUT) != RPC_SUCCESS) {
+               return (NULL);
+       }
+       return (&clnt_res);
 }
 
 generic_ret *
 setkey_principal3_2(setkey3_arg *argp, CLIENT *clnt)
 {
-    static generic_ret clnt_res;
-
-    memset(&clnt_res, 0, sizeof(clnt_res));
-    if (clnt_call(clnt, SETKEY_PRINCIPAL3,
-                  (xdrproc_t) xdr_setkey3_arg, (caddr_t) argp,
-                  (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
-                  TIMEOUT) != RPC_SUCCESS) {
-        return (NULL);
-    }
-    return (&clnt_res);
+       static generic_ret clnt_res;
+
+       memset(&clnt_res, 0, sizeof(clnt_res));
+       if (clnt_call(clnt, SETKEY_PRINCIPAL3,
+                     (xdrproc_t) xdr_setkey3_arg, (caddr_t) argp,
+                     (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
+                     TIMEOUT) != RPC_SUCCESS) {
+               return (NULL);
+       }
+       return (&clnt_res);
 }
 
 chrand_ret *
 chrand_principal_2(chrand_arg *argp, CLIENT *clnt)
 {
-    static chrand_ret clnt_res;
-
-    memset(&clnt_res, 0, sizeof(clnt_res));
-    if (clnt_call(clnt, CHRAND_PRINCIPAL,
-                  (xdrproc_t) xdr_chrand_arg, (caddr_t) argp,
-                  (xdrproc_t) xdr_chrand_ret, (caddr_t) &clnt_res,
-                  TIMEOUT) != RPC_SUCCESS) {
-        return (NULL);
-    }
-    return (&clnt_res);
+       static chrand_ret clnt_res;
+
+       memset(&clnt_res, 0, sizeof(clnt_res));
+       if (clnt_call(clnt, CHRAND_PRINCIPAL,
+                     (xdrproc_t) xdr_chrand_arg, (caddr_t) argp,
+                     (xdrproc_t) xdr_chrand_ret, (caddr_t) &clnt_res,
+                     TIMEOUT) != RPC_SUCCESS) {
+               return (NULL);
+       }
+       return (&clnt_res);
 }
 
 chrand_ret *
 chrand_principal3_2(chrand3_arg *argp, CLIENT *clnt)
 {
-    static chrand_ret clnt_res;
-
-    memset(&clnt_res, 0, sizeof(clnt_res));
-    if (clnt_call(clnt, CHRAND_PRINCIPAL3,
-                  (xdrproc_t) xdr_chrand3_arg, (caddr_t) argp,
-                  (xdrproc_t) xdr_chrand_ret, (caddr_t) &clnt_res,
-                  TIMEOUT) != RPC_SUCCESS) {
-        return (NULL);
-    }
-    return (&clnt_res);
+       static chrand_ret clnt_res;
+
+       memset(&clnt_res, 0, sizeof(clnt_res));
+       if (clnt_call(clnt, CHRAND_PRINCIPAL3,
+                     (xdrproc_t) xdr_chrand3_arg, (caddr_t) argp,
+                     (xdrproc_t) xdr_chrand_ret, (caddr_t) &clnt_res,
+                     TIMEOUT) != RPC_SUCCESS) {
+               return (NULL);
+       }
+       return (&clnt_res);
 }
 
 generic_ret *
 create_policy_2(cpol_arg *argp, CLIENT *clnt)
 {
-    static generic_ret clnt_res;
-
-    memset(&clnt_res, 0, sizeof(clnt_res));
-    if (clnt_call(clnt, CREATE_POLICY,
-                  (xdrproc_t) xdr_cpol_arg, (caddr_t) argp,
-                  (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
-                  TIMEOUT) != RPC_SUCCESS) {
-        return (NULL);
-    }
-    return (&clnt_res);
+       static generic_ret clnt_res;
+
+       memset(&clnt_res, 0, sizeof(clnt_res));
+       if (clnt_call(clnt, CREATE_POLICY,
+                     (xdrproc_t) xdr_cpol_arg, (caddr_t) argp,
+                     (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
+                     TIMEOUT) != RPC_SUCCESS) {
+               return (NULL);
+       }
+       return (&clnt_res);
 }
 
 generic_ret *
 delete_policy_2(dpol_arg *argp, CLIENT *clnt)
 {
-    static generic_ret clnt_res;
-
-    memset(&clnt_res, 0, sizeof(clnt_res));
-    if (clnt_call(clnt, DELETE_POLICY,
-                  (xdrproc_t) xdr_dpol_arg, (caddr_t) argp,
-                  (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
-                  TIMEOUT) != RPC_SUCCESS) {
-        return (NULL);
-    }
-    return (&clnt_res);
+       static generic_ret clnt_res;
+
+       memset(&clnt_res, 0, sizeof(clnt_res));
+       if (clnt_call(clnt, DELETE_POLICY,
+                     (xdrproc_t) xdr_dpol_arg, (caddr_t) argp,
+                     (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
+                     TIMEOUT) != RPC_SUCCESS) {
+               return (NULL);
+       }
+       return (&clnt_res);
 }
 
 generic_ret *
 modify_policy_2(mpol_arg *argp, CLIENT *clnt)
 {
-    static generic_ret clnt_res;
-
-    memset(&clnt_res, 0, sizeof(clnt_res));
-    if (clnt_call(clnt, MODIFY_POLICY,
-                  (xdrproc_t) xdr_mpol_arg, (caddr_t) argp,
-                  (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
-                  TIMEOUT) != RPC_SUCCESS) {
-        return (NULL);
-    }
-    return (&clnt_res);
+       static generic_ret clnt_res;
+
+       memset(&clnt_res, 0, sizeof(clnt_res));
+       if (clnt_call(clnt, MODIFY_POLICY,
+                     (xdrproc_t) xdr_mpol_arg, (caddr_t) argp,
+                     (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
+                     TIMEOUT) != RPC_SUCCESS) {
+               return (NULL);
+       }
+       return (&clnt_res);
 }
 
 gpol_ret *
 get_policy_2(gpol_arg *argp, CLIENT *clnt)
 {
-    static gpol_ret clnt_res;
-
-    memset(&clnt_res, 0, sizeof(clnt_res));
-    if (clnt_call(clnt, GET_POLICY,
-                  (xdrproc_t) xdr_gpol_arg, (caddr_t) argp,
-                  (xdrproc_t) xdr_gpol_ret, (caddr_t) &clnt_res,
-                  TIMEOUT) != RPC_SUCCESS) {
-        return (NULL);
-    }
-    return (&clnt_res);
+       static gpol_ret clnt_res;
+
+       memset(&clnt_res, 0, sizeof(clnt_res));
+       if (clnt_call(clnt, GET_POLICY,
+                     (xdrproc_t) xdr_gpol_arg, (caddr_t) argp,
+                     (xdrproc_t) xdr_gpol_ret, (caddr_t) &clnt_res,
+                     TIMEOUT) != RPC_SUCCESS) {
+               return (NULL);
+       }
+       return (&clnt_res);
 }
 
 gpols_ret *
 get_pols_2(gpols_arg *argp, CLIENT *clnt)
 {
-    static gpols_ret clnt_res;
-
-    memset(&clnt_res, 0, sizeof(clnt_res));
-    if (clnt_call(clnt, GET_POLS,
-                  (xdrproc_t) xdr_gpols_arg, (caddr_t) argp,
-                  (xdrproc_t) xdr_gpols_ret, (caddr_t) &clnt_res,
-                  TIMEOUT) != RPC_SUCCESS) {
-        return (NULL);
-    }
-    return (&clnt_res);
+       static gpols_ret clnt_res;
+
+       memset(&clnt_res, 0, sizeof(clnt_res));
+       if (clnt_call(clnt, GET_POLS,
+                     (xdrproc_t) xdr_gpols_arg, (caddr_t) argp,
+                     (xdrproc_t) xdr_gpols_ret, (caddr_t) &clnt_res,
+                     TIMEOUT) != RPC_SUCCESS) {
+            return (NULL);
+       }
+       return (&clnt_res);
 }
 
 getprivs_ret *
 get_privs_2(void *argp, CLIENT *clnt)
 {
-    static getprivs_ret clnt_res;
-
-    memset(&clnt_res, 0, sizeof(clnt_res));
-    if (clnt_call(clnt, GET_PRIVS,
-                  (xdrproc_t) xdr_u_int32, (caddr_t) argp,
-                  (xdrproc_t) xdr_getprivs_ret, (caddr_t) &clnt_res,
-                  TIMEOUT) != RPC_SUCCESS) {
-        return (NULL);
-    }
-    return (&clnt_res);
+     static getprivs_ret clnt_res;
+
+     memset(&clnt_res, 0, sizeof(clnt_res));
+     if (clnt_call(clnt, GET_PRIVS,
+                  (xdrproc_t) xdr_u_int32, (caddr_t) argp,
+                  (xdrproc_t) xdr_getprivs_ret, (caddr_t) &clnt_res,
+                  TIMEOUT) != RPC_SUCCESS) {
+         return (NULL);
+     }
+     return (&clnt_res);
 }
 
 generic_ret *
 init_2(void *argp, CLIENT *clnt)
 {
-    static generic_ret clnt_res;
-
-    memset(&clnt_res, 0, sizeof(clnt_res));
-    if (clnt_call(clnt, INIT,
-                  (xdrproc_t) xdr_u_int32, (caddr_t) argp,
-                  (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
-                  TIMEOUT) != RPC_SUCCESS) {
-        return (NULL);
-    }
-    return (&clnt_res);
+     static generic_ret clnt_res;
+
+     memset(&clnt_res, 0, sizeof(clnt_res));
+     if (clnt_call(clnt, INIT,
+                  (xdrproc_t) xdr_u_int32, (caddr_t) argp,
+                  (xdrproc_t) xdr_generic_ret, (caddr_t) &clnt_res,
+                  TIMEOUT) != RPC_SUCCESS) {
+         return (NULL);
+     }
+     return (&clnt_res);
 }

diff --git a/src/lib/kadm5/kadm_rpc.h b/src/lib/kadm5/kadm_rpc.h
index d793ed88c7552d7cfbb8e6e61cdd232f94322258..fb86605a49b41f4508963dee55e6b2c7dde6df76 100644 (file)
--- a/src/lib/kadm5/kadm_rpc.h
+++ b/src/lib/kadm5/kadm_rpc.h
@@ -1,3 +1,4 @@
+/* -*- mode: c; c-file-style: "bsd"; indent-tabs-mode: t -*- */
 #ifndef __KADM_RPC_H__
 #define __KADM_RPC_H__
 
@@ -51,13 +52,13 @@ struct rprinc_arg {
 typedef struct rprinc_arg rprinc_arg;
 
 struct gprincs_arg {
-        krb5_ui_4 api_version;
+       krb5_ui_4 api_version;
        char *exp;
 };
 typedef struct gprincs_arg gprincs_arg;
 
 struct gprincs_ret {
-        krb5_ui_4 api_version;
+       krb5_ui_4 api_version;
        kadm5_ret_t code;
        char **princs;
        int count;
@@ -84,15 +85,15 @@ typedef struct chpass3_arg chpass3_arg;
 struct setv4key_arg {
        krb5_ui_4 api_version;
        krb5_principal princ;
-        krb5_keyblock *keyblock;
+       krb5_keyblock *keyblock;
 };
 typedef struct setv4key_arg setv4key_arg;
 
 struct setkey_arg {
        krb5_ui_4 api_version;
        krb5_principal princ;
-        krb5_keyblock *keyblocks;
-        int n_keys;
+       krb5_keyblock *keyblocks;
+       int n_keys;
 };
 typedef struct setkey_arg setkey_arg;
 
@@ -102,8 +103,8 @@ struct setkey3_arg {
        krb5_boolean keepold;
        int n_ks_tuple;
        krb5_key_salt_tuple *ks_tuple;
-        krb5_keyblock *keyblocks;
-        int n_keys;
+       krb5_keyblock *keyblocks;
+       int n_keys;
 };
 typedef struct setkey3_arg setkey3_arg;
 
@@ -179,13 +180,13 @@ struct gpol_ret {
 typedef struct gpol_ret gpol_ret;
 
 struct gpols_arg {
-        krb5_ui_4 api_version;
+       krb5_ui_4 api_version;
        char *exp;
 };
 typedef struct gpols_arg gpols_arg;
 
 struct gpols_ret {
-        krb5_ui_4 api_version;
+       krb5_ui_4 api_version;
        kadm5_ret_t code;
        char **pols;
        int count;

diff --git a/src/lib/kadm5/kadm_rpc_xdr.c b/src/lib/kadm5/kadm_rpc_xdr.c
index 41ab3f1f90ec52eb03be73ede55ae580c10eac0a..36724eab3dbaa76320b7c966036ca486b8ea5ba6 100644 (file)
--- a/src/lib/kadm5/kadm_rpc_xdr.c
+++ b/src/lib/kadm5/kadm_rpc_xdr.c
@@ -1,3 +1,4 @@
+/* -*- mode: c; c-file-style: "bsd"; indent-tabs-mode: t -*- */
 /*
  * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved
  */
@@ -700,7 +701,7 @@ xdr_setv4key_arg(XDR *xdrs, setv4key_arg *objp)
        if (!xdr_array(xdrs, (caddr_t *) &objp->keyblock,
                       &n_keys, ~0,
                       sizeof(krb5_keyblock), xdr_krb5_keyblock)) {
-               return (FALSE);
+               return (FALSE);
        }
        return (TRUE);
 }
@@ -717,7 +718,7 @@ xdr_setkey_arg(XDR *xdrs, setkey_arg *objp)
        if (!xdr_array(xdrs, (caddr_t *) &objp->keyblocks,
                       (unsigned int *) &objp->n_keys, ~0,
                       sizeof(krb5_keyblock), xdr_krb5_keyblock)) {
-               return (FALSE);
+               return (FALSE);
        }
        return (TRUE);
 }

diff --git a/src/lib/kadm5/srv/adb_xdr.c b/src/lib/kadm5/srv/adb_xdr.c
index 87ed27a431cf20fb01880ba7a960f3c6e69f5687..8c0cc9d24c2f9691c613d05b8e74186f4e67b56a 100644 (file)
--- a/src/lib/kadm5/srv/adb_xdr.c
+++ b/src/lib/kadm5/srv/adb_xdr.c
@@ -1,4 +1,4 @@
-/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* -*- mode: c; c-file-style: "bsd"; indent-tabs-mode: t -*- */
 /*
  * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved
  *
@@ -12,7 +12,7 @@ static char *rcsid = "$Header$";
 #include <sys/types.h>
 #include <krb5.h>
 #include <gssrpc/rpc.h>
-#include        "server_internal.h"
+#include       "server_internal.h"
 #include "admin_xdr.h"
 #ifdef HAVE_MEMORY_H
 #include <memory.h>
@@ -24,27 +24,27 @@ xdr_krb5_key_data(XDR *xdrs, krb5_key_data *objp)
     unsigned int tmp;
 
     if (!xdr_krb5_int16(xdrs, &objp->key_data_ver))
-        return(FALSE);
+       return(FALSE);
     if (!xdr_krb5_int16(xdrs, &objp->key_data_kvno))
-        return(FALSE);
+       return(FALSE);
     if (!xdr_krb5_int16(xdrs, &objp->key_data_type[0]))
-        return(FALSE);
+       return(FALSE);
     if (!xdr_krb5_int16(xdrs, &objp->key_data_type[1]))
-        return(FALSE);
+       return(FALSE);
     if (!xdr_krb5_ui_2(xdrs, &objp->key_data_length[0]))
-        return(FALSE);
+       return(FALSE);
     if (!xdr_krb5_ui_2(xdrs, &objp->key_data_length[1]))
-        return(FALSE);
+       return(FALSE);
 
     tmp = (unsigned int) objp->key_data_length[0];
     if (!xdr_bytes(xdrs, (char **) &objp->key_data_contents[0],
-                   &tmp, ~0))
-        return FALSE;
+                  &tmp, ~0))
+       return FALSE;
 
     tmp = (unsigned int) objp->key_data_length[1];
     if (!xdr_bytes(xdrs, (char **) &objp->key_data_contents[1],
-                   &tmp, ~0))
-        return FALSE;
+                  &tmp, ~0))
+       return FALSE;
 
     /* don't need to copy tmp out, since key_data_length will be set
        by the above encoding. */
@@ -56,10 +56,10 @@ bool_t
 xdr_osa_pw_hist_ent(XDR *xdrs, osa_pw_hist_ent *objp)
 {
     if (!xdr_array(xdrs, (caddr_t *) &objp->key_data,
-                   (u_int *) &objp->n_key_data, ~0,
-                   sizeof(krb5_key_data),
-                   xdr_krb5_key_data))
-        return (FALSE);
+                  (u_int *) &objp->n_key_data, ~0,
+                  sizeof(krb5_key_data),
+                  xdr_krb5_key_data))
+       return (FALSE);
     return (TRUE);
 }
 
@@ -68,33 +68,33 @@ xdr_osa_princ_ent_rec(XDR *xdrs, osa_princ_ent_t objp)
 {
     switch (xdrs->x_op) {
     case XDR_ENCODE:
-        objp->version = OSA_ADB_PRINC_VERSION_1;
-        /* fall through */
+        objp->version = OSA_ADB_PRINC_VERSION_1;
+        /* fall through */
     case XDR_FREE:
-        if (!xdr_int(xdrs, &objp->version))
-            return FALSE;
-        break;
+        if (!xdr_int(xdrs, &objp->version))
+             return FALSE;
+        break;
     case XDR_DECODE:
-        if (!xdr_int(xdrs, &objp->version))
-            return FALSE;
-        if (objp->version != OSA_ADB_PRINC_VERSION_1)
-            return FALSE;
-        break;
+        if (!xdr_int(xdrs, &objp->version))
+             return FALSE;
+        if (objp->version != OSA_ADB_PRINC_VERSION_1)
+             return FALSE;
+        break;
     }
 
     if (!xdr_nullstring(xdrs, &objp->policy))
-        return (FALSE);
+       return (FALSE);
     if (!xdr_long(xdrs, &objp->aux_attributes))
-        return (FALSE);
+       return (FALSE);
     if (!xdr_u_int(xdrs, &objp->old_key_next))
-        return (FALSE);
+       return (FALSE);
     if (!xdr_krb5_kvno(xdrs, &objp->admin_history_kvno))
-        return (FALSE);
+       return (FALSE);
     if (!xdr_array(xdrs, (caddr_t *) &objp->old_keys,
-                   (unsigned int *) &objp->old_key_len, ~0,
-                   sizeof(osa_pw_hist_ent),
-                   xdr_osa_pw_hist_ent))
-        return (FALSE);
+                  (unsigned int *) &objp->old_key_len, ~0,
+                  sizeof(osa_pw_hist_ent),
+                  xdr_osa_pw_hist_ent))
+       return (FALSE);
     return (TRUE);
 }
 

diff --git a/src/lib/krb5/krb/strftime.c b/src/lib/krb5/krb/strftime.c
index f2a5cb719ad3f7cdf8747a52816cd6e3f8aa9be4..65c5e7a3839138be54208b3a8991c14c99ab3cbc 100644 (file)
--- a/src/lib/krb5/krb/strftime.c
+++ b/src/lib/krb5/krb/strftime.c
@@ -1,3 +1,4 @@
+/* -*- mode: c; c-file-style: "bsd"; indent-tabs-mode: t -*- */
 /*     $NetBSD: strftime.c,v 1.8 1999/02/07 17:33:30 augustss Exp $    */
 
 /*

diff --git a/src/lib/krb5/krb/strptime.c b/src/lib/krb5/krb/strptime.c
index ffe90d4c96ef0c311dbe862f4e6827efb31c3707..b1d5d6cc3da9361018a9da801be45d806b724a5e 100644 (file)
--- a/src/lib/krb5/krb/strptime.c
+++ b/src/lib/krb5/krb/strptime.c
@@ -1,3 +1,4 @@
+/* -*- mode: c; c-file-style: "bsd"; indent-tabs-mode: t -*- */
 /*     $NetBSD: strptime.c,v 1.18 1999/04/29 02:58:30 tv Exp $ */
 
 /*-