From a988be716b87b0dca69688ed3b909af0a69e91f6 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 8 Feb 2006 04:11:08 +0000 Subject: r13384: Adding in some more SuSE patches * uninitialized-variables.diff * samba-smbadduser.diff * samba-implicit_decl.patch (This used to be commit 064338c6f5644d1ceddf341d4ba5619a3d68ffa7) --- source3/modules/getdate.c | 1 + source3/modules/getdate.y | 1 + source3/pam_smbpass/pam_smb_auth.c | 2 +- source3/smbadduser.in | 6 +++--- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/source3/modules/getdate.c b/source3/modules/getdate.c index 491c51294e..51211f316d 100644 --- a/source3/modules/getdate.c +++ b/source3/modules/getdate.c @@ -138,6 +138,7 @@ #endif #include +#include #if HAVE_STDLIB_H # include /* for `free'; used by Bison 1.27 */ diff --git a/source3/modules/getdate.y b/source3/modules/getdate.y index aab37f4d23..60b1aa577e 100644 --- a/source3/modules/getdate.y +++ b/source3/modules/getdate.y @@ -43,6 +43,7 @@ #endif #include +#include #if HAVE_STDLIB_H # include /* for `free'; used by Bison 1.27 */ diff --git a/source3/pam_smbpass/pam_smb_auth.c b/source3/pam_smbpass/pam_smb_auth.c index cbdb6fa811..f604d42449 100644 --- a/source3/pam_smbpass/pam_smb_auth.c +++ b/source3/pam_smbpass/pam_smb_auth.c @@ -67,7 +67,7 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags, SAM_ACCOUNT *sampass = NULL; extern BOOL in_client; const char *name; - void (*oldsig_handler)(int); + void (*oldsig_handler)(int) = NULL; BOOL found; /* Points to memory managed by the PAM library. Do not free. */ diff --git a/source3/smbadduser.in b/source3/smbadduser.in index 05da7de08e..4b9671319a 100644 --- a/source3/smbadduser.in +++ b/source3/smbadduser.in @@ -10,15 +10,15 @@ PRIVATEDIR=@privatedir@ CONFIGDIR=@configdir@ unalias * -set path = ($path /usr/local/samba/bin) +set path = ($path /usr/bin) set smbpasswd = $PRIVATEDIR/smbpasswd -set user_map = $CONFIGDIR/users.map +set user_map = $CONFIGDIR/smbusers # # Set to site specific passwd command # -set passwd = "cat /etc/passwd" +set passwd = "getent passwd" #set passwd = "niscat passwd.org_dir" #set passwd = "ypcat passwd" -- cgit