The branch, master has been updated via af82bf2 s3-net: Fix uninitialized variable in rpc_conf_import_internal(). via d810ada Fix sys_fseek wrapper via 6af702b build: added autoconf --disable-silent-rules option from b15d325 s3:net registry: fix segfault when net registry is called without subcommands...
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit af82bf2ac574b17cd2f7442f13928848d7d5a1e3 Author: Günther Deschner <g...@samba.org> Date: Fri Oct 14 16:51:07 2011 +0200 s3-net: Fix uninitialized variable in rpc_conf_import_internal(). Michael, please check. Guenther Autobuild-User: Günther Deschner <g...@samba.org> Autobuild-Date: Fri Oct 14 19:25:47 CEST 2011 on sn-devel-104 commit d810ada39c584fd2a543f41fb3a121520ab0764e Author: Brad Smith <b...@comstyle.com> Date: Wed Oct 12 04:23:58 2011 -0400 Fix sys_fseek wrapper Signed-off-by: Günther Deschner <g...@samba.org> commit 6af702bdc9ea36a1f33232a818a819afde9bc4d2 Author: Sumit Bose <sb...@redhat.com> Date: Thu Oct 6 10:32:58 2011 +0200 build: added autoconf --disable-silent-rules option Signed-off-by: Günther Deschner <g...@samba.org> ----------------------------------------------------------------------- Summary of changes: buildtools/wafsamba/wscript | 3 +++ source3/configure.in | 2 +- source3/lib/system.c | 2 ++ source3/utils/net_rpc_conf.c | 2 +- source3/wscript | 4 ++-- 5 files changed, 9 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript index 1a7f3eb..5c5e249 100755 --- a/buildtools/wafsamba/wscript +++ b/buildtools/wafsamba/wscript @@ -162,6 +162,9 @@ def set_options(opt): opt.add_option('--disable-dependency-tracking', help=SUPPRESS_HELP, action='store_true', dest='AUTOCONF_DISABLE_DEPENDENCY_TRACKING', default=False) + opt.add_option('--disable-silent-rules', + help=SUPPRESS_HELP, + action='store_true', dest='AUTOCONF_DISABLE_SILENT_RULES', default=False) gr = opt.option_group('dist options') gr.add_option('--sign-release', diff --git a/source3/configure.in b/source3/configure.in index 7405cfd..7780603 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -1085,7 +1085,7 @@ AC_CHECK_FUNCS(getgrset) AC_CHECK_FUNCS(setpriv setgidx setuidx setgroups sysconf stat64 fstat64) AC_CHECK_FUNCS(lstat64 fopen64 atexit grantpt lseek64 ftruncate64 posix_fallocate posix_fallocate64) AC_CHECK_FUNCS(fallocate fallocate64) -AC_CHECK_FUNCS(fseek64 fseeko64 ftell64 ftello64 setluid getpwanam) +AC_CHECK_FUNCS(fseeko fseek64 fseeko64 ftell64 ftello64 setluid getpwanam) AC_CHECK_FUNCS(opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64) AC_CHECK_FUNCS(fdopendir fdopendir64) AC_CHECK_FUNCS(getpwent_r) diff --git a/source3/lib/system.c b/source3/lib/system.c index 0aefd6d..45fe77e 100644 --- a/source3/lib/system.c +++ b/source3/lib/system.c @@ -734,6 +734,8 @@ int sys_fseek(FILE *fp, SMB_OFF_T offset, int whence) return fseek64(fp, offset, whence); #elif defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(LARGE_SMB_OFF_T) && defined(HAVE_FSEEKO64) return fseeko64(fp, offset, whence); +#elif defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(LARGE_SMB_OFF_T) && defined(HAVE_FSEEKO) + return fseeko(fp, offset, whence); #else return fseek(fp, offset, whence); #endif diff --git a/source3/utils/net_rpc_conf.c b/source3/utils/net_rpc_conf.c index 3dec375..68d5df2 100644 --- a/source3/utils/net_rpc_conf.c +++ b/source3/utils/net_rpc_conf.c @@ -1146,7 +1146,7 @@ static NTSTATUS rpc_conf_import_internal(struct net_context *c, struct smbconf_service *service = NULL; struct smbconf_service **services = NULL; uint32_t num_shares, i; - sbcErr err; + sbcErr err = SBC_ERR_UNKNOWN_FAILURE; WERROR werr = WERR_OK; NTSTATUS status = NT_STATUS_OK; diff --git a/source3/wscript b/source3/wscript index 82434a5..6717852 100644 --- a/source3/wscript +++ b/source3/wscript @@ -82,7 +82,7 @@ def configure(conf): conf.CHECK_FUNCS('initgroups select poll rdchk getgrnam getgrent pathconf') conf.CHECK_FUNCS('setpriv setgidx setuidx setgroups sysconf stat64 fstat64') conf.CHECK_FUNCS('lstat64 fopen64 atexit grantpt lseek64 ftruncate64 fallocate fallocate64 posix_fallocate posix_fallocate64') - conf.CHECK_FUNCS('fseek64 fseeko64 ftell64 ftello64 setluid') + conf.CHECK_FUNCS('fseeko fseek64 fseeko64 ftell64 ftello64 setluid') conf.CHECK_FUNCS('getpwnam', headers='sys/types.h pwd.h') conf.CHECK_FUNCS('opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64') conf.CHECK_FUNCS('fdopendir fdopendir64') @@ -234,7 +234,7 @@ extattr_get_link extattr_list_fd extattr_list_file extattr_list_link extattr_set_fd extattr_set_file extattr_set_link _facl __facl _fchdir __fchdir fchmod fchown _fcntl __fcntl fcvt fcvtl fdatasync fdelproplist fgetea fgetproplist fgetxattr flistea flistxattr fopen64 -_fork __fork fremoveea fremovexattr fseek64 fseeko64 fsetea +_fork __fork fremoveea fremovexattr fseeko fseek64 fseeko64 fsetea fsetproplist fsetxattr _fstat __fstat fstat64 _fstat64 __fstat64 fsync ftell64 ftello64 ftruncate64 futimens futimes __fxstat getauthuid getcwd _getcwd __getcwd getdents __getdents getdents64 getdirentries -- Samba Shared Repository