svn commit: samba r13230 - in branches/SAMBA_3_0_RELEASE: . source source/modules source/nsswitch source/passdb source/script

jerry at samba.org jerry at samba.org
Mon Jan 30 14:35:00 GMT 2006


Author: jerry
Date: 2006-01-30 14:34:58 +0000 (Mon, 30 Jan 2006)
New Revision: 13230

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13230

Log:
ready to do for 3.0.21b
Modified:
   branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
   branches/SAMBA_3_0_RELEASE/source/configure.in
   branches/SAMBA_3_0_RELEASE/source/modules/vfs_recycle.c
   branches/SAMBA_3_0_RELEASE/source/nsswitch/wbinfo.c
   branches/SAMBA_3_0_RELEASE/source/passdb/pdb_tdb.c
   branches/SAMBA_3_0_RELEASE/source/script/mkversion.sh


Changeset:
Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
===================================================================
--- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt	2006-01-30 13:32:41 UTC (rev 13229)
+++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt	2006-01-30 14:34:58 UTC (rev 13230)
@@ -166,6 +166,7 @@
     * Use the same CFLAGS for generating the pch as we use to 
       actually compile.
     * Correct typo when compiling the vfs_catia module.
+    * Fix automatic recreation of a new tdb sam file.
 
 
 o   Derrell Lipman <derrell at samba.org>
@@ -217,6 +218,8 @@
 o   Simo Sorce <idra at samba.org>
     * Crackcheck utility enhancement based on patch sent by 
       Tom Geissler.
+    * BUG 3405: Fix segv ni vfs_recycle module on platforms wither 
+      mode_t is not 32-bits.
 
 
 o   John Terpstra <jht at samba.org>

Modified: branches/SAMBA_3_0_RELEASE/source/configure.in
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/configure.in	2006-01-30 13:32:41 UTC (rev 13229)
+++ branches/SAMBA_3_0_RELEASE/source/configure.in	2006-01-30 14:34:58 UTC (rev 13230)
@@ -4505,8 +4505,8 @@
 	AC_MSG_RESULT(yes)
 	case "$host_os" in
 	*)
-		AC_CHECK_LIB(rt,aio_read,[AIO_LIBS="$AIO_LIBS -lrt"])
-		AC_CHECK_LIB(aio,aio_read,[AIO_LIBS="$AIO_LIBS -laio"])
+		AC_CHECK_LIB(rt,aio_read,[AIO_LIBS="$LIBS -lrt"])
+		AC_CHECK_LIB(aio,aio_read,[AIO_LIBS="$LIBS -laio"])
 		AC_CACHE_CHECK([for asynchronous io support],samba_cv_HAVE_AIO,[
 		aio_LIBS=$LIBS
 		LIBS=$AIO_LIBS

Modified: branches/SAMBA_3_0_RELEASE/source/modules/vfs_recycle.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/modules/vfs_recycle.c	2006-01-30 13:32:41 UTC (rev 13229)
+++ branches/SAMBA_3_0_RELEASE/source/modules/vfs_recycle.c	2006-01-30 14:34:58 UTC (rev 13230)
@@ -166,19 +166,19 @@
 
 static mode_t recycle_directory_mode(vfs_handle_struct *handle)
 {
-	mode_t dirmode;
+	int dirmode;
 	const char *buff;
 
 	buff = lp_parm_const_string(SNUM(handle->conn), "recycle", "directory_mode", NULL);
 
 	if (buff != NULL ) {
-		sscanf(buff, "%o", (int *)&dirmode);
+		sscanf(buff, "%o", &dirmode);
 	} else {
 		dirmode=S_IRUSR | S_IWUSR | S_IXUSR;
 	}
 
 	DEBUG(10, ("recycle: directory_mode = %o\n", dirmode));
-	return dirmode;
+	return (mode_t)dirmode;
 }
 
 static BOOL recycle_directory_exist(vfs_handle_struct *handle, const char *dname)

Modified: branches/SAMBA_3_0_RELEASE/source/nsswitch/wbinfo.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/nsswitch/wbinfo.c	2006-01-30 13:32:41 UTC (rev 13229)
+++ branches/SAMBA_3_0_RELEASE/source/nsswitch/wbinfo.c	2006-01-30 14:34:58 UTC (rev 13230)
@@ -47,7 +47,7 @@
 	    NSS_STATUS_SUCCESS) {
 		d_fprintf(stderr, "could not obtain winbind separator!\n");
 		if (strict) {
-			return -1;
+			return 0;
 		}
 		/* HACK: (this module should not call lp_ funtions) */
 		return *lp_winbind_separator();
@@ -59,7 +59,7 @@
 	if (!sep) {
 		d_fprintf(stderr, "winbind separator was NULL!\n");
 		if (strict) {
-			return -1;
+			return 0;
 		}
 		/* HACK: (this module should not call lp_ funtions) */
 		sep = *lp_winbind_separator();
@@ -1217,7 +1217,7 @@
 			break;
 		case OPT_SEPARATOR: {
 			const char sep = winbind_separator_int(True);
-			if (sep == -1) {
+			if ( !sep ) {
 				goto done;
 			}
 			d_printf("%c\n", sep);

Modified: branches/SAMBA_3_0_RELEASE/source/passdb/pdb_tdb.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/passdb/pdb_tdb.c	2006-01-30 13:32:41 UTC (rev 13229)
+++ branches/SAMBA_3_0_RELEASE/source/passdb/pdb_tdb.c	2006-01-30 14:34:58 UTC (rev 13230)
@@ -423,6 +423,7 @@
 			if (!(pwd_tdb = tdbsam_tdbopen(tdb_state->tdbsam_location, O_CREAT ))) {
 				DEBUG(0, ("pdb_getsampwnam: TDB passwd (%s) did not exist. File successfully created.\n",
 				          tdb_state->tdbsam_location));
+				tdb_close(pwd_tdb);
 			} else {
 				DEBUG(0, ("pdb_getsampwnam: TDB passwd (%s) does not exist. Couldn't create new one. Error was: %s\n",
 				          tdb_state->tdbsam_location, strerror(errno)));

Modified: branches/SAMBA_3_0_RELEASE/source/script/mkversion.sh
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/script/mkversion.sh	2006-01-30 13:32:41 UTC (rev 13229)
+++ branches/SAMBA_3_0_RELEASE/source/script/mkversion.sh	2006-01-30 14:34:58 UTC (rev 13230)
@@ -102,7 +102,12 @@
 echo "$0: 'include/version.h' created for Samba(\"${SAMBA_VERSION_STRING}\")"
 
 if test -n "${SAMBA_VERSION_VENDOR_SUFFIX}";then
-    echo "$0: with VENDOR_SUFFIX = ${SAMBA_VERSION_VENDOR_SUFFIX}"
+    echo -n "$0: with VENDOR_SUFFIX = \""
+    echo -n ${SAMBA_VERSION_VENDOR_SUFFIX} | sed 's/"//g'
+    if test -n ${SAMBA_VENDOR_PATCH}; then
+       echo -n "-${SAMBA_VENDOR_PATCH}"
+   fi
+   echo "\""
 fi
 
 exit 0



More information about the samba-cvs mailing list