diff options
| author | Jeff Layton <jlayton@redhat.com> | 2008-09-14 08:37:45 -0400 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-09-15 10:59:29 +0200 |
| commit | 326bd60b594ad796604c24b39067495174653d15 (patch) | |
| tree | df3e8795730b86f99e83274473472c88dc8ef4aa | |
| parent | cad8e9f04466241ba2d88df75c31779b77873bbb (diff) | |
| download | samba-326bd60b594ad796604c24b39067495174653d15.tar.gz samba-326bd60b594ad796604c24b39067495174653d15.tar.xz samba-326bd60b594ad796604c24b39067495174653d15.zip | |
cifs.upcall: make most functions static and silence compiler warnings
...to silence -Wmissing-prototypes and some uninit'ed variable
warnings. Thanks to GD for the extra-paranoid compiler flags.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit bc5274eb66ebe40aea3ab917a20f2f353172ca93)
| -rw-r--r-- | source/client/cifs.upcall.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/source/client/cifs.upcall.c b/source/client/cifs.upcall.c index 7cb51660d7e..4110de35fde 100644 --- a/source/client/cifs.upcall.c +++ b/source/client/cifs.upcall.c @@ -32,6 +32,7 @@ create dns_resolver * * /usr/local/sbin/cifs.upcall %k const char *CIFSSPNEGO_VERSION = "1.2"; static const char *prog = "cifs.upcall"; typedef enum _secType { + NONE = 0, KRB5, MS_KRB5 } secType_t; @@ -56,7 +57,8 @@ typedef enum _secType { * * ret: 0 - success, others - failure */ -int handle_krb5_mech(const char *oid, const char *principal, +static int +handle_krb5_mech(const char *oid, const char *principal, DATA_BLOB * secblob, DATA_BLOB * sess_key) { int retval; @@ -88,7 +90,8 @@ int handle_krb5_mech(const char *oid, const char *principal, #define DKD_HAVE_UID 32 #define DKD_MUSTHAVE_SET (DKD_HAVE_HOSTNAME|DKD_HAVE_VERSION|DKD_HAVE_SEC) -int decode_key_description(const char *desc, int *ver, secType_t * sec, +static int +decode_key_description(const char *desc, int *ver, secType_t * sec, char **hostname, uid_t * uid) { int retval = 0; @@ -151,7 +154,8 @@ int decode_key_description(const char *desc, int *ver, secType_t * sec, return retval; } -int cifs_resolver(const key_serial_t key, const char *key_descr) +static int +cifs_resolver(const key_serial_t key, const char *key_descr) { int c; struct addrinfo *addr; @@ -203,7 +207,7 @@ int cifs_resolver(const key_serial_t key, const char *key_descr) return 0; } -void +static void usage(void) { syslog(LOG_WARNING, "Usage: %s [-c] [-v] key_serial", prog); @@ -215,12 +219,12 @@ int main(const int argc, char *const argv[]) struct cifs_spnego_msg *keydata = NULL; DATA_BLOB secblob = data_blob_null; DATA_BLOB sess_key = data_blob_null; - secType_t sectype; + secType_t sectype = NONE; key_serial_t key = 0; size_t datalen; long rc = 1; - uid_t uid; - int kernel_upcall_version; + uid_t uid = 0; + int kernel_upcall_version = 0; int c, use_cifs_service_prefix = 0; char *buf, *hostname = NULL; const char *oid; |