Hi,

attached are three small patches for Samba_2_2 CVS.
The first patch fixes a typo in web/swat.c.
The second patch changes a compiler option for AIX to allow the compiler to 
use more memory.
The last patch updates the recylce bin. This change was suggested by Guilio 
Orsero.

...Juergen
--- configure.in.orig	Fri Aug 23 22:34:32 2002
+++ configure.in	Sun Sep  1 17:05:12 2002
@@ -915,12 +915,10 @@
 			BLDSHARED="true"
 			LDSHFLAGS="-Wl,-bexpall,-bM:SRE,-bnoentry"
 			DYNEXP="-Wl,-brtl,-bexpall"
-			if test "${GCC}" = "yes"; then
 				PICFLAG="-O2"
-			else
-				PICFLAG="-O2 -qmaxmem=6000"
+			if test "${GCC}" = "no"; then
 				## for funky AIX compiler using strncpy()
-				CFLAGS="$CFLAGS -D_LINUX_SOURCE_COMPAT"
+				CFLAGS="$CFLAGS -D_LINUX_SOURCE_COMPAT -qmaxmem=32000"
 			fi

 			AC_DEFINE(STAT_ST_BLOCKSIZE,DEV_BSIZE)
--- recycle.orig	Wed Aug 28 19:09:49 2002
+++ recycle.c	Sun Sep  1 17:45:38 2002
@@ -154,8 +154,6 @@
 		if (current->recycle_bin == NULL)
 			return False;
 		current->recycle_bin = safe_strcpy(current->recycle_bin,pszParmValue,sizeof(pstring));
-		standard_sub_basic(current->recycle_bin, strlen(current->recycle_bin));
-		trim_string(current->recycle_bin,"/","/");
 		DEBUG(10, ("name=%s\n", current->recycle_bin));
 	} else if (StrCaseCmp("mode",pszParmName)==0) {
 		if (checkparam(pszParmValue,"KEEP_DIRECTORIES") == True)
@@ -256,6 +254,8 @@
 		rc=pm_process( conf_file, do_section, do_parameter);
 		DEBUG(10, ("pm_process returned %d\n", rc));
 	}
+	standard_sub_conn( conn , current->recycle_bin,sizeof(pstring));
+	trim_string(current->recycle_bin,"/","/");
 	conn->vfs_private= (void *)current;
 	return 0;
 }
--- web/swat.c.orig	Fri Aug 23 22:34:45 2002
+++ web/swat.c	Sun Sep  1 17:24:46 2002
@@ -746,7 +746,7 @@
 	printf("<td><input type=radio name=\"WINSType\" value=0 %s> Not Used&nbsp;</td>", (winstype == 0) ? "checked" : "");
 	printf("<td><input type=radio name=\"WINSType\" value=1 %s> Server for client use&nbsp;</td>", (winstype == 1) ? "checked" : "");
 	printf("<td><input type=radio name=\"WINSType\" value=2 %s> Client of another WINS server&nbsp;</td>", (winstype == 2) ? "checked" : "");
-	printf("<tr><td></td><td></td><td></td><td>Remote WINS Server&nbsp;<input type=text size=\"16\" name=\"WINSAddr\" value=\"\%s\"></td></tr>",lp_wins_server());
+	printf("<tr><td></td><td></td><td></td><td>Remote WINS Server&nbsp;<input type=text size=\"16\" name=\"WINSAddr\" value=\"%s\"></td></tr>",lp_wins_server());
 	if (winstype == 3) {
 		printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">Error: WINS Server Mode and WINS Support both set in smb.conf</font></td></tr>");
 		printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">Please Select desired WINS mode above.</font></td></tr>");

Reply via email to