From: Gerald Carter Date: Tue, 27 Aug 2002 23:39:38 +0000 (+0000) Subject: syncing up for 2.2.6pre2 X-Git-Tag: samba-2.2.6pre2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e41d4ad5e68515ccb18a2a996a1e1c0901689bf4;p=thirdparty%2Fsamba.git syncing up for 2.2.6pre2 --- diff --git a/docs/docbook/manpages/testparm.1.sgml b/docs/docbook/manpages/testparm.1.sgml index 320e39e6f58..9128d8f4c51 100644 --- a/docs/docbook/manpages/testparm.1.sgml +++ b/docs/docbook/manpages/testparm.1.sgml @@ -18,6 +18,7 @@ testparm -s -h + -x -L <servername> config filename hostname hostIP @@ -69,6 +70,10 @@ Print usage message + + -x + Print only parameters that have non-default values + -L servername diff --git a/docs/htmldocs/printer_driver2.html b/docs/htmldocs/printer_driver2.html index b3dbc9f9fcb..b94d0fbbfd4 100644 --- a/docs/htmldocs/printer_driver2.html +++ b/docs/htmldocs/printer_driver2.html @@ -165,7 +165,7 @@ CLASS="PARAMETER" >printer driver file parameter, are being depreciated and should not +> parameter, are being deprecated and should not be used in new installations. For more information on this change, you should refer to the \ No newline at end of file +> diff --git a/docs/manpages/testparm.1 b/docs/manpages/testparm.1 index 384f7bde0ab..13afa02c7ff 100644 --- a/docs/manpages/testparm.1 +++ b/docs/manpages/testparm.1 @@ -8,7 +8,7 @@ testparm \- check an smb.conf configuration file for internal correctness .SH SYNOPSIS .sp -\fBtestparm\fR [ \fB-s\fR ] [ \fB-h\fR ] [ \fB-L \fR ] \fBconfig filename\fR [ \fBhostname hostIP\fR ] +\fBtestparm\fR [ \fB-s\fR ] [ \fB-h\fR ] [\fB-x\fR] [ \fB-L \fR ] \fBconfig filename\fR [ \fBhostname hostIP\fR ] .SH "DESCRIPTION" .PP This tool is part of the Sambasuite. @@ -46,6 +46,9 @@ Sets the value of the %L macro to \fIservername\fR. This is useful for testing include files specified with the %L macro. .TP +\fB-x\fR +Exclude from parameter list all parameters with values set at default. +.TP \fBconfigfilename\fR This is the name of the configuration file to check. If this parameter is not present then the diff --git a/examples/VFS/recycle/recycle.c b/examples/VFS/recycle/recycle.c index 4e7b6c7bcf3..4d793395ce3 100644 --- a/examples/VFS/recycle/recycle.c +++ b/examples/VFS/recycle/recycle.c @@ -326,7 +326,7 @@ static BOOL recycle_create_dir(connection_struct *conn, const char *dname) pstrcpy(tempstr,dname); y=tempstr; /* Create directory tree if neccessary */ - while((c=strsep(&y,"/"))) { + for(c = strtok(y,"/"); c; c= strtok(NULL,"/")) { pstrcat(newdir,c); if (recycle_directory_exist(conn,newdir)) DEBUG(3, ("dir %s already exists\n",newdir)); diff --git a/packaging/Caldera/OpenLinux/samba2.spec-lsb.tmpl b/packaging/Caldera/OpenLinux/samba2.spec-lsb.tmpl index 8af6974b58f..2b8bba8fb29 100644 --- a/packaging/Caldera/OpenLinux/samba2.spec-lsb.tmpl +++ b/packaging/Caldera/OpenLinux/samba2.spec-lsb.tmpl @@ -28,10 +28,6 @@ Requires : libpam >= 0.66, SysVinit-scripts >= 1.04-6 BuildRoot : /tmp/%{Name}-%{Version} Source: ftp://ftp.samba.org/pub/samba/%{Name}-%{Version}.tar.gz -#Patch0: %{Name}-%{Version}-smbmount.patch -#Patch1: %{Name}-%{Version}-install.patch -#Patch2: %{Name}-%{Version}-smbconf.patch -Patch6: %{Name}-2.2.2-libsmbclient.patch %Package doc Group : Server/Network @@ -192,10 +188,6 @@ a clean and stable API for SMB client application development. %Prep %setup -#%patch0 -p1 -#%patch1 -p1 -#%patch2 -p1 -%patch6 -p1 # instead of patch (to help configuration) ... ;^) %{fixUP} -vbT source/Makefile.in -e ' @@ -265,7 +257,7 @@ done %Build cd source -autoreconf +#autoreconf CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \ --with-fhs \ diff --git a/packaging/Caldera/OpenLinux/samba2.spec-sam.tmpl b/packaging/Caldera/OpenLinux/samba2.spec-sam.tmpl index 07b188d81be..86ed85a3513 100644 --- a/packaging/Caldera/OpenLinux/samba2.spec-sam.tmpl +++ b/packaging/Caldera/OpenLinux/samba2.spec-sam.tmpl @@ -28,10 +28,6 @@ Requires : libpam >= 0.66, SysVinit-scripts >= 1.04-6 BuildRoot : /tmp/%{Name}-%{Version} Source: ftp://ftp.samba.org/pub/samba/%{Name}-%{Version}.tar.gz -#Patch0: %{Name}-%{Version}-smbmount.patch -#Patch1: %{Name}-%{Version}-install.patch -#Patch2: %{Name}-%{Version}-smbconf.patch -#Patch6: %{Name}-2.2.2-libsmbclient.patch %Package doc Group : Server/Network @@ -191,9 +187,6 @@ a clean and stable API for SMB client application development. %Prep %setup -#%patch0 -p1 -#%patch1 -p1 -#%patch2 -p1 # instead of patch (to help configuration) ... ;^) %{fixUP} -vbT source/Makefile.in -e ' diff --git a/packaging/Caldera/OpenLinux/samba2.spec-team.tmpl b/packaging/Caldera/OpenLinux/samba2.spec-team.tmpl index 216d23e6162..3d90ecc7fe9 100644 --- a/packaging/Caldera/OpenLinux/samba2.spec-team.tmpl +++ b/packaging/Caldera/OpenLinux/samba2.spec-team.tmpl @@ -28,11 +28,6 @@ Requires : libpam >= 0.66, SysVinit-scripts >= 1.04-6 BuildRoot : /tmp/%{Name}-%{Version} Source: ftp://ftp.samba.org/pub/samba/%{Name}-%{Version}.tar.gz -#Patch0: %{Name}-%{Version}-smbmount.patch -#Patch1: %{Name}-%{Version}-install.patch -#Patch2: %{Name}-%{Version}-smbconf.patch -#Patch6: %{Name}-2.2.2-libsmbclient.patch -Patch7: kanji-makefile.patch %Package doc Group : Server/Network @@ -282,9 +277,6 @@ CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \ --with-utmp \ --with-winbind \ --with-syslog -# --with-tdbsam - -#%patch7 -p1 make LOGFILEBASE=/var/log/samba.d everything nsswitch/libnss_wins.so diff --git a/packaging/Caldera/OpenLinux/samba2.spec.tmpl b/packaging/Caldera/OpenLinux/samba2.spec.tmpl index 9b5299867c8..8036a112f27 100644 --- a/packaging/Caldera/OpenLinux/samba2.spec.tmpl +++ b/packaging/Caldera/OpenLinux/samba2.spec.tmpl @@ -29,9 +29,6 @@ Requires : libpam >= 0.66, SysVinit-scripts >= 1.04-6 BuildRoot : /tmp/%{Name}-%{Version} Source: ftp://ftp.samba.org/pub/samba/%{Name}-%{Version}.tar.gz -#Patch0: %{Name}-%{Version}-smbmount.patch -#Patch1: %{Name}-%{Version}-install.patch -#Patch2: %{Name}-%{Version}-smbconf.patch %Package doc @@ -188,9 +185,6 @@ verificar rapidamente o efeite de qualquer altera %Prep %setup -#%patch0 -p1 -#%patch1 -p1 -#%patch2 -p1 # instead of patch (to help configuration) ... ;^) %{fixUP} -vbT source/Makefile.in -e ' diff --git a/packaging/Mandrake/README.mandrake b/packaging/Mandrake/README.mandrake new file mode 100644 index 00000000000..83920f238f1 --- /dev/null +++ b/packaging/Mandrake/README.mandrake @@ -0,0 +1,117 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +The Mandrake samba spec file used for packaging for Mandrake and cooker +is now also used by the makerpms.sh script, and you can pass any options +that you would normally pass to rpm via the makerpms.sh script. + +Note that only release after 8.1 support passing options using +"--with