[SCM] Samba Shared Repository - branch master updated - cb7d7beb99ab7952b5187c05b2660283d93e59fc

[Jeremy Allison]

The branch, master has been updated
       via  cb7d7beb99ab7952b5187c05b2660283d93e59fc (commit)
      from  227c8000dfee4248fc2d13104382542e449a1897 (commit)

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


- Log -----------------------------------------------------------------
commit cb7d7beb99ab7952b5187c05b2660283d93e59fc
Author: Jeremy Allison <jeremy at jeremy-desktop.(none)>
Date:   Tue Dec 23 09:50:10 2008 -0800

    Fix another "format not a string literal and no format arguments" warning.
    Jeremy

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

Summary of changes:
 source3/libnet/libnet_samsync_ldif.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libnet/libnet_samsync_ldif.c b/source3/libnet/libnet_samsync_ldif.c
index c72eadf..3068f8d 100644
--- a/source3/libnet/libnet_samsync_ldif.c
+++ b/source3/libnet/libnet_samsync_ldif.c
@@ -586,7 +586,7 @@ static NTSTATUS fetch_account_info_to_ldif(TALLOC_CTX *mem_ctx,
 	uchar zero_buf[16];
 	uint32 rid = 0, group_rid = 0, gidNumber = 0;
 	time_t unix_time;
-	int i;
+	int i, ret;
 
 	memset(zero_buf, '\0', sizeof(zero_buf));
 
@@ -660,7 +660,10 @@ static NTSTATUS fetch_account_info_to_ldif(TALLOC_CTX *mem_ctx,
 		return NT_STATUS_UNSUCCESSFUL;
 	}
 	gidNumber = groupmap[i].gidNumber;
-	snprintf(sambaSID, sizeof(sambaSID), groupmap[i].sambaSID);
+	ret = snprintf(sambaSID, sizeof(sambaSID), "%s", groupmap[i].sambaSID);
+	if (ret < 0 || ret == sizeof(sambaSID)) {
+		return NT_STATUS_UNSUCCESSFUL;
+	}
 
 	/* Set up sambaAcctFlags */
 	flags = pdb_encode_acct_ctrl(r->acct_flags,


-- 
Samba Shared Repository