[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1907-g2b68fb7

[Michael Adam]

The branch, master has been updated
       via  2b68fb7cb4ab5b76028c54ef163badd2952fe0c0 (commit)
       via  e31d4ee936cf8f7ec02770fa4b87fc821820b2ae (commit)
       via  c3b67446d03957fc530afa079b344937253737ef (commit)
       via  23e3b446893285cd0667e3168c503c7b57c2d3ff (commit)
      from  dde62b35d7730d0c09b6479fab7baae809d2551e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 2b68fb7cb4ab5b76028c54ef163badd2952fe0c0
Author: Michael Adam <obnox at samba.org>
Date:   Fri May 29 23:48:26 2009 +0200

    s3:pdbedit: fix "format not a string literal and no format arguments" warnings
    
    Michael

commit e31d4ee936cf8f7ec02770fa4b87fc821820b2ae
Author: Michael Adam <obnox at samba.org>
Date:   Fri May 29 01:12:47 2009 +0200

    s3:add prototype of map_nt_error_from_wbcErr() to proto.h
    
    Michael

commit c3b67446d03957fc530afa079b344937253737ef
Author: Michael Adam <obnox at samba.org>
Date:   Fri May 29 01:08:36 2009 +0200

    libsmbclient: make SMBC_module_terminate() static.
    
    Michael

commit 23e3b446893285cd0667e3168c503c7b57c2d3ff
Author: Michael Adam <obnox at samba.org>
Date:   Fri May 29 01:02:46 2009 +0200

    s3:pam_smbpass: make smb_update_db() static.
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 source3/include/proto.h              |    1 +
 source3/libsmb/libsmb_context.c      |    2 +-
 source3/pam_smbpass/pam_smb_passwd.c |    2 +-
 source3/utils/pdbedit.c              |    4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index d5e403f..a0ff361 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -3001,6 +3001,7 @@ NTSTATUS dos_to_ntstatus(uint8 eclass, uint32 ecode);
 void ntstatus_to_dos(NTSTATUS ntstatus, uint8 *eclass, uint32 *ecode);
 NTSTATUS werror_to_ntstatus(WERROR error);
 WERROR ntstatus_to_werror(NTSTATUS error);
+NTSTATUS map_nt_error_from_wbcErr(wbcErr wbc_err);
 NTSTATUS map_nt_error_from_gss(uint32 gss_maj, uint32 minor);
 
 /* The following definitions come from libsmb/namecache.c  */
diff --git a/source3/libsmb/libsmb_context.c b/source3/libsmb/libsmb_context.c
index bacd907..9888587 100644
--- a/source3/libsmb/libsmb_context.c
+++ b/source3/libsmb/libsmb_context.c
@@ -120,7 +120,7 @@ SMBC_module_init(void * punused)
 }
 
 
-void
+static void
 SMBC_module_terminate(void)
 {
     gencache_shutdown();
diff --git a/source3/pam_smbpass/pam_smb_passwd.c b/source3/pam_smbpass/pam_smb_passwd.c
index 9504e4d..0563af3 100644
--- a/source3/pam_smbpass/pam_smb_passwd.c
+++ b/source3/pam_smbpass/pam_smb_passwd.c
@@ -45,7 +45,7 @@
 
 #include "support.h"
 
-int smb_update_db( pam_handle_t *pamh, int ctrl, const char *user,  const char *pass_new )
+static int smb_update_db( pam_handle_t *pamh, int ctrl, const char *user,  const char *pass_new )
 {
 	int retval;
 	char *err_str = NULL;
diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index 000f8c8..17175eb 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -630,7 +630,7 @@ static int new_user(const char *username, const char *fullname,
 
 	status = local_password_change(username, flags, pwd1, &err, &msg);
 	if (!NT_STATUS_IS_OK(status)) {
-		if (err) fprintf(stderr, err);
+		if (err) fprintf(stderr, "%s", err);
 		ret = -1;
 		goto done;
 	}
@@ -738,7 +738,7 @@ static int new_machine(const char *machinename)
 		print_user_info(name, True, False);
 		ret = 0;
 	} else {
-		if (err) fprintf(stderr, err);
+		if (err) fprintf(stderr, "%s", err);
 		ret = -1;
 	}
 


-- 
Samba Shared Repository