[SCM] Samba Shared Repository - branch master updated -
38fff9f9227c2c70a9d522f8355a9e1967e7cb72
Jeremy Allison
jra at samba.org
Mon Sep 15 23:14:35 GMT 2008
The branch, master has been updated
via 38fff9f9227c2c70a9d522f8355a9e1967e7cb72 (commit)
via 47feb1722896bfcd20ec56df39bc0c87fd706563 (commit)
from 06b2410427f763427475226d78247405b9384756 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 38fff9f9227c2c70a9d522f8355a9e1967e7cb72
Author: Steven Danneman <steven.danneman at isilon.com>
Date: Mon Sep 15 15:48:55 2008 -0700
Fixed "uninitialized variable" build warning
With gcc 4.1.3 on Ubuntu 7.10 the following build warning occurs:
Compiling libnet/libnet_samsync_keytab.c
cc1: warnings being treated as errors
libnet/libnet_samsync_keytab.c: In function âfetch_sam_entries_keytabâ:
libnet/libnet_samsync_keytab.c:102: warning: âentry.enctypeâ is used uninitialized in this function
Fixed by initializing to ENCTYPE_NULL
commit 47feb1722896bfcd20ec56df39bc0c87fd706563
Author: Steven Danneman <steven.danneman at isilon.com>
Date: Mon Sep 15 15:47:43 2008 -0700
Fix build warning on FreeBSD
Fix for the following build warning:
Compiling torture/cmd_vfs.c
torture/cmd_vfs.c: In function `cmd_open':
torture/cmd_vfs.c:275: warning: unsigned int format, different type arg (arg 3)
torture/cmd_vfs.c: In function `cmd_mknod':
torture/cmd_vfs.c:992: warning: unsigned int format, different type arg (arg 3)
sccanf had mismatched types for mode_t between formating parameter and var args.
-----------------------------------------------------------------------
Summary of changes:
source3/libnet/libnet_samsync_keytab.c | 1 +
source3/torture/cmd_vfs.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libnet/libnet_samsync_keytab.c b/source3/libnet/libnet_samsync_keytab.c
index f284f08..9e666ce 100644
--- a/source3/libnet/libnet_samsync_keytab.c
+++ b/source3/libnet/libnet_samsync_keytab.c
@@ -93,6 +93,7 @@ static NTSTATUS fetch_sam_entry_keytab(TALLOC_CTX *mem_ctx,
ctx->dns_domain_name);
entry.password = data_blob_talloc(mem_ctx, nt_passwd, 16);
entry.kvno = ads_get_kvno(ctx->ads, entry.name);
+ entry.enctype = ENCTYPE_NULL;
NT_STATUS_HAVE_NO_MEMORY(entry.name);
NT_STATUS_HAVE_NO_MEMORY(entry.principal);
diff --git a/source3/torture/cmd_vfs.c b/source3/torture/cmd_vfs.c
index 2840088..dddd5be 100644
--- a/source3/torture/cmd_vfs.c
+++ b/source3/torture/cmd_vfs.c
@@ -272,7 +272,7 @@ static NTSTATUS cmd_open(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, c
flagstr++;
}
if ((flags & O_CREAT) && argc == 4) {
- if (sscanf(argv[3], "%o", &mode) == 0) {
+ if (sscanf(argv[3], "%ho", (unsigned short *)&mode) == 0) {
printf("open: error=-1 (invalid mode!)\n");
return NT_STATUS_UNSUCCESSFUL;
}
@@ -989,7 +989,7 @@ static NTSTATUS cmd_mknod(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc,
return NT_STATUS_OK;
}
- if (sscanf(argv[2], "%o", &mode) == 0) {
+ if (sscanf(argv[2], "%ho", (unsigned short *)&mode) == 0) {
printf("open: error=-1 (invalid mode!)\n");
return NT_STATUS_UNSUCCESSFUL;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list