10 files changed, 130 insertions, 165 deletions
diff --git a/net/samba3/files/patch-Makefile.in b/net/samba3/files/patch-Makefile.in
index b54c7080f85..cb0d950f771 100644
--- a/net/samba3/files/patch-Makefile.in
+++ b/net/samba3/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Mon Feb 20 21:33:23 2006
-+++ Makefile.in	Sat Feb 25 05:30:42 2006
-@@ -1390,7 +1390,7 @@
+--- Makefile.in.orig	Thu Apr 20 04:29:46 2006
++++ Makefile.in	Tue Apr 25 01:05:05 2006
+@@ -1410,7 +1410,7 @@
+ 	@echo Linking $@
+ 	@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) script/tests/timelimit.o
  
- bin/t_snprintf@EXEEXT@: lib/snprintf.c
- 	$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) -DTEST_SNPRINTF lib/snprintf.c -lm
--install: installbin installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@
-+install: installbin installscripts installdat installswat installmodules
+-install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@
++install: installservers installbin installscripts installdat installswat installmodules
  
  install-everything: install installmodules
  
diff --git a/net/samba3/files/patch-configure.in b/net/samba3/files/patch-configure.in
index cfd1e474506..a91fb732872 100644
--- a/net/samba3/files/patch-configure.in
+++ b/net/samba3/files/patch-configure.in
@@ -1,6 +1,14 @@
---- configure.in.orig	Mon Feb 20 21:33:23 2006
-+++ configure.in	Sat Feb 25 05:34:56 2006
-@@ -968,6 +968,21 @@
+--- configure.in.orig	Fri Jun 23 15:16:53 2006
++++ configure.in	Tue Jun 27 01:17:29 2006
+@@ -242,7 +242,6 @@
+ AC_SUBST(SHELL)
+ AC_SUBST(LDSHFLAGS)
+ AC_SUBST(SONAMEFLAG)
+-AC_SUBST(NSSSONAMEVERSIONSUFFIX)
+ AC_SUBST(SHLD)
+ AC_SUBST(HOST_OS)
+ AC_SUBST(PICFLAGS)
+@@ -1089,6 +1088,21 @@
     AC_DEFINE(HAVE_SIG_ATOMIC_T_TYPE,1,[Whether we have the atomic_t variable type])
  fi
  
@@ -22,25 +30,69 @@
  AC_CACHE_CHECK([for struct timespec type],samba_cv_struct_timespec, [
      AC_TRY_COMPILE([
  #include <sys/types.h>
-@@ -1408,7 +1423,6 @@
+@@ -1639,7 +1653,6 @@
+ HOST_OS="$host_os"
+ LDSHFLAGS="-shared"
+ SONAMEFLAG="#"
+-NSSSONAMEVERSIONSUFFIX=""
+ SHLD="\${CC} \${CFLAGS}"
+ PICFLAGS=""
+ PICSUFFIX="po"
+@@ -1664,7 +1677,6 @@
  			DYNEXP="-Wl,--export-dynamic"
  			PICFLAGS="-fPIC"
  			SONAMEFLAG="-Wl,-soname="
--			SONAMEVERSIONSUFFIX=".2"
+-			NSSSONAMEVERSIONSUFFIX=".2"
  			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
  			;;
  		*solaris*) AC_DEFINE(SUNOS5,1,[Whether the host os is solaris])
-@@ -4911,11 +4925,13 @@
+@@ -1674,7 +1686,6 @@
+ 			if test "${GCC}" = "yes"; then
+ 				PICFLAGS="-fPIC"
+ 				SONAMEFLAG="-Wl,-soname="
+-				NSSSONAMEVERSIONSUFFIX=".1"
+ 				if test "${ac_cv_prog_gnu_ld}" = "yes"; then
+ 					DYNEXP="-Wl,-E"
+ 				fi
+@@ -4868,6 +4879,7 @@
+ 	AC_MSG_RESULT(yes)
+ 	case "$host_os" in
+ 	*)
++		AIO_LIBS=$LIBS
+ 		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,[
+@@ -5268,14 +5280,17 @@
+ WINBIND_NSS="nsswitch/libnss_winbind.$SHLIBEXT"
+ WINBIND_WINS_NSS="nsswitch/libnss_wins.$SHLIBEXT"
+ WINBIND_NSS_LDSHFLAGS=$LDSHFLAGS
++NSSSONAMEVERSIONSUFFIX=""
  
  case "$host_os" in
  	*linux*)
-+		SONAMEVERSIONSUFFIX=".2"
++		NSSSONAMEVERSIONSUFFIX=".2"
  		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
  		;;
  	*freebsd[[5-9]]*)
  		# FreeBSD winbind client is implemented as a wrapper around
  		# the Linux version.
-+		SONAMEVERSIONSUFFIX=".1"
++		NSSSONAMEVERSIONSUFFIX=".1"
  		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
  		    nsswitch/winbind_nss_linux.o"
  		WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT"
+@@ -5290,6 +5305,7 @@
+ 	*solaris*)
+ 		# Solaris winbind client is implemented as a wrapper around
+ 		# the Linux version.
++		NSSSONAMEVERSIONSUFFIX=".1"
+ 		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_solaris.o \
+ 		    nsswitch/winbind_nss_linux.o"
+ 		WINBIND_NSS_EXTRA_LIBS="-lsocket"
+@@ -5316,6 +5332,7 @@
+ AC_SUBST(WINBIND_NSS_LDSHFLAGS)
+ AC_SUBST(WINBIND_NSS_EXTRA_OBJS)
+ AC_SUBST(WINBIND_NSS_EXTRA_LIBS)
++AC_SUBST(NSSSONAMEVERSIONSUFFIX)
+ 
+ # Check the setting of --with-winbind
+ 
diff --git a/net/samba3/files/patch-nsswitch_pam_winbind.c b/net/samba3/files/patch-nsswitch_pam_winbind.c
index d0101bc7175..039643a83d1 100644
--- a/net/samba3/files/patch-nsswitch_pam_winbind.c
+++ b/net/samba3/files/patch-nsswitch_pam_winbind.c
@@ -1,36 +1,20 @@
---- nsswitch/pam_winbind.c.orig	Thu Sep 29 23:52:42 2005
-+++ nsswitch/pam_winbind.c	Mon Jan  2 03:40:23 2006
-@@ -86,7 +86,7 @@
- 	struct pam_response *resp;
- 	
- 	pmsg[0] = &msg[0];
--	msg[0].msg = text;
-+	msg[0].msg = CONST_DISCARD(char *, text);
- 	msg[0].msg_style = type;
- 	
- 	resp = NULL;
-@@ -359,7 +359,7 @@
- 		if (comment != NULL) {
- 			pmsg[0] = &msg[0];
- 			msg[0].msg_style = PAM_TEXT_INFO;
--			msg[0].msg = comment;
-+			msg[0].msg = CONST_DISCARD(char *, comment);
- 			i = 1;
- 		} else {
- 			i = 0;
-@@ -367,13 +367,13 @@
- 
- 		pmsg[i] = &msg[i];
- 		msg[i].msg_style = PAM_PROMPT_ECHO_OFF;
--		msg[i++].msg = prompt1;
-+		msg[i++].msg = CONST_DISCARD(char *, prompt1);
- 		replies = 1;
- 
- 		if (prompt2 != NULL) {
- 			pmsg[i] = &msg[i];
- 			msg[i].msg_style = PAM_PROMPT_ECHO_OFF;
--			msg[i++].msg = prompt2;
-+			msg[i++].msg = CONST_DISCARD(char *, prompt2);
- 			++replies;
+--- nsswitch/pam_winbind.c.orig	Sun May 28 02:21:10 2006
++++ nsswitch/pam_winbind.c	Sun May 28 02:22:16 2006
+@@ -997,7 +997,7 @@
  		}
- 		/* so call the conversation expecting i responses */
+ 		return PAM_USER_UNKNOWN;
+ 	case 0:
+-		pam_get_data( pamh, PAM_WINBIND_NEW_AUTHTOK_REQD, (const void **)&tmp);
++		pam_get_data( pamh, PAM_WINBIND_NEW_AUTHTOK_REQD, (void **)&tmp);
+ 		if (tmp != NULL) {
+ 			retval = atoi(tmp);
+ 			switch (retval) {
+@@ -1300,7 +1300,7 @@
+ 		 * By reaching here we have approved the passwords and must now
+ 		 * rebuild the password database file.
+ 		 */
+-		pam_get_data( pamh, PAM_WINBIND_PWD_LAST_SET, (const void **)&pwdlastset_update);
++		pam_get_data( pamh, PAM_WINBIND_PWD_LAST_SET, (void **)&pwdlastset_update);
+ 
+ 		retval = winbind_chauthtok_request(pamh, ctrl, user, pass_old, pass_new, pwdlastset_update);
+ 		if (retval) {
diff --git a/net/samba3/files/patch-pam_smbpass b/net/samba3/files/patch-pam_smbpass
index 15e1292ad26..a4946fc4833 100644
--- a/net/samba3/files/patch-pam_smbpass
+++ b/net/samba3/files/patch-pam_smbpass
@@ -1,19 +1,6 @@
---- pam_smbpass/general.h.orig	Fri Feb 25 18:59:30 2005
-+++ pam_smbpass/general.h	Mon Jan  2 03:47:49 2006
-@@ -50,10 +50,6 @@
- #define set(x,ctrl)   (ctrl = ((ctrl)&smb_args[x].mask)|smb_args[x].flag)
- #define unset(x,ctrl) (ctrl &= ~(smb_args[x].flag))
- 
--#ifndef __linux__
--#define strncasecmp(s1,s2,n) StrnCaseCmp(s1,s2,n)
--#endif
--
- /* the generic mask */
- #define _ALL_ON_  (~0U)
- 
---- pam_smbpass/pam_smb_auth.c.orig	Tue Oct 18 04:44:59 2005
-+++ pam_smbpass/pam_smb_auth.c	Mon Jan  2 03:47:49 2006
-@@ -163,7 +163,7 @@
+--- pam_smbpass/pam_smb_auth.c.orig	Thu Apr 20 04:29:22 2006
++++ pam_smbpass/pam_smb_auth.c	Sat May 27 01:57:31 2006
+@@ -164,7 +164,7 @@
  
      retval = PAM_SUCCESS;
  
@@ -22,9 +9,9 @@
      if(pretval) {
  	retval = *pretval;
  	SAFE_FREE(pretval);
---- pam_smbpass/pam_smb_passwd.c.orig	Thu Jul 28 15:19:44 2005
-+++ pam_smbpass/pam_smb_passwd.c	Mon Jan  2 03:47:49 2006
-@@ -224,7 +224,7 @@
+--- pam_smbpass/pam_smb_passwd.c.orig	Thu Apr 20 04:29:22 2006
++++ pam_smbpass/pam_smb_passwd.c	Sat May 27 01:57:31 2006
+@@ -226,7 +226,7 @@
                                     (const void **)&pass_old );
          } else {
              retval = pam_get_data( pamh, _SMB_OLD_AUTHTOK,
@@ -33,17 +20,8 @@
              if (retval == PAM_NO_MODULE_DATA) {
  		pass_old = NULL;
                  retval = PAM_SUCCESS;
---- pam_smbpass/support.c.orig	Thu Jul 28 15:19:44 2005
-+++ pam_smbpass/support.c	Mon Jan  2 03:47:49 2006
-@@ -114,7 +114,7 @@
- 			struct pam_response *resp;
- 
- 			pmsg[0] = &msg[0];
--			msg[0].msg = text;
-+			msg[0].msg = CONST_DISCARD(char *, text);
- 			msg[0].msg_style = type;
- 			resp = NULL;
- 
+--- pam_smbpass/support.c.orig	Sun May 28 02:23:20 2006
++++ pam_smbpass/support.c	Sun May 28 02:24:07 2006
 @@ -384,7 +384,7 @@
              if (newauth != NULL) {
  
@@ -53,30 +31,6 @@
  
                  if (old != NULL) {
                      newauth->count = old->count + 1;
-@@ -515,7 +515,7 @@
-     if (comment != NULL && off(SMB__QUIET, ctrl)) {
-         pmsg[0] = &msg[0];
-         msg[0].msg_style = PAM_TEXT_INFO;
--        msg[0].msg = comment;
-+        msg[0].msg = CONST_DISCARD(char *, comment);
-         i = 1;
-     } else {
-         i = 0;
-@@ -523,12 +523,12 @@
- 
-     pmsg[i] = &msg[i];
-     msg[i].msg_style = PAM_PROMPT_ECHO_OFF;
--    msg[i++].msg = prompt1;
-+    msg[i++].msg = CONST_DISCARD(char *, prompt1);
- 
-     if (prompt2 != NULL) {
-         pmsg[i] = &msg[i];
-         msg[i].msg_style = PAM_PROMPT_ECHO_OFF;
--        msg[i++].msg = prompt2;
-+        msg[i++].msg = CONST_DISCARD(char *, prompt2);
-         expect = 2;
-     } else
-         expect = 1;
 @@ -594,7 +594,7 @@
  
          retval = pam_set_data( pamh, data_name, (void *) token, _cleanup );
diff --git a/net/samba3/files/patch-script_installbin.sh b/net/samba3/files/patch-script_installbin.sh
deleted file mode 100644
index 66a0577eeb1..00000000000
--- a/net/samba3/files/patch-script_installbin.sh
+++ /dev/null
@@ -1,12 +0,0 @@
---- script/installbin.sh.orig	Tue Mar  9 15:33:32 2004
-+++ script/installbin.sh	Tue Mar  9 15:35:43 2004
-@@ -17,8 +17,7 @@
-  p2=`basename $p`
-  echo Installing $p as $BINDIR/$p2
-  if [ -f $BINDIR/$p2 ]; then
--   rm -f $BINDIR/$p2.old
--   mv $BINDIR/$p2 $BINDIR/$p2.old
-+   rm -f $BINDIR/$p2 $BINDIR/$p2.old
-  fi
-  cp $p $BINDIR/
-  chmod $INSTALLPERMS $BINDIR/$p2
diff --git a/net/samba3/files/patch-script_installbin.sh.in b/net/samba3/files/patch-script_installbin.sh.in
new file mode 100644
index 00000000000..62743918b3e
--- /dev/null
+++ b/net/samba3/files/patch-script_installbin.sh.in
@@ -0,0 +1,15 @@
+--- script/installbin.sh.in.orig	Sun Jun 25 04:08:55 2006
++++ script/installbin.sh.in	Sun Jun 25 04:10:00 2006
+@@ -13,11 +13,7 @@
+ for p in $*; do
+  p2=`basename $p`
+  echo "Installing $p as $DESTDIR/$BINDIR/$p2 "
+- if [ -f $DESTDIR/$BINDIR/$p2 ]; then
+-   rm -f $DESTDIR/$BINDIR/$p2.old
+-   mv $DESTDIR/$BINDIR/$p2 $DESTDIR/$BINDIR/$p2.old
+- fi
+- cp $p $DESTDIR/$BINDIR/
++ cp -f $p $DESTDIR/$BINDIR/
+  chmod $INSTALLPERMS $DESTDIR/$BINDIR/$p2
+ 
+  # this is a special case, mount needs this in a specific location
diff --git a/net/samba3/files/patch-script_installscripts.sh b/net/samba3/files/patch-script_installscripts.sh
deleted file mode 100644
index 4091df6c429..00000000000
--- a/net/samba3/files/patch-script_installscripts.sh
+++ /dev/null
@@ -1,12 +0,0 @@
---- script/installscripts.sh.orig	Tue Mar  9 15:35:54 2004
-+++ script/installscripts.sh	Tue Mar  9 15:36:38 2004
-@@ -25,8 +25,7 @@
-   p2=`basename $p`
-   echo Installing $BINDIR/$p2
-   if [ -f $BINDIR/$p2 ]; then
--    rm -f $BINDIR/$p2.old
--    mv $BINDIR/$p2 $BINDIR/$p2.old
-+    rm -f $BINDIR/$p2 $BINDIR/$p2.old
-   fi
-   cp $p $BINDIR/
-   chmod $INSTALLPERMS $BINDIR/$p2
diff --git a/net/samba3/files/patch-script_installswat.sh b/net/samba3/files/patch-script_installswat.sh
index f2ea5abcaee..34af2088a74 100644
--- a/net/samba3/files/patch-script_installswat.sh
+++ b/net/samba3/files/patch-script_installswat.sh
@@ -1,12 +1,12 @@
---- script/installswat.sh.orig	Thu Jul 28 19:44:16 2005
-+++ script/installswat.sh	Wed Aug  3 02:33:04 2005
-@@ -8,8 +8,7 @@
- echo Installing SWAT in $SWATDIR
- echo Installing the Samba Web Administration Tool
+--- script/installswat.sh.orig	Thu Apr 20 04:29:42 2006
++++ script/installswat.sh	Tue Apr 25 02:12:10 2006
+@@ -21,8 +21,7 @@
+ 		;;
+ esac
  
 -LANGS=". `cd $SRCDIR../swat/; /bin/echo lang/??`"
--echo Installing langs are `cd $SRCDIR../swat/lang/; /bin/echo ??`
+-echo "langs are `cd $SRCDIR../swat/lang/; /bin/echo ??` "
 +LANGS="."
  
- for ln in $LANGS; do 
-  SWATLANGDIR=$SWATDIR/$ln
+ if test "$mode" = 'install'; then
+  for ln in $LANGS; do 
diff --git a/net/samba3/files/samba.sh.sample b/net/samba3/files/samba.in
index df449013789..1f5a1c1a5d0 100644
--- a/net/samba3/files/samba.sh.sample
+++ b/net/samba3/files/samba.in
@@ -5,8 +5,8 @@
 
 # PROVIDE: nmbd smbd
 %%WINBIND%%# PROVIDE: winbindd
-# REQUIRE: NETWORKING SERVERS named ldconfig %%CUPS%%
-# BEFORE: DAEMON
+# REQUIRE: NETWORKING SERVERS DAEMON ldconfig resolv %%CUPSD%%
+# BEFORE: LOGIN
 # KEYWORD: shutdown
 
 #
@@ -29,7 +29,7 @@ rcvar=`set_rcvar`
 
 load_rc_config $name
 # Set defaults
-samba_config=${samba_config:-"%%SAMBA_CONFIG%%"}
+samba_config=${samba_config="%%SAMBA_CONFIG%%"}
 # Config file is required
 if [ ! -r ${samba_config} ]; then
     warn "${samba_config} is not readable."
@@ -39,28 +39,15 @@ if [ ! -r ${samba_config} ]; then
     esac
 fi
 
-if test -n ${samba_enable:-""} && checkyesno samba_enable; then
-    nmbd_enable=${nmbd_enable:-"YES"}
-    smbd_enable=${smbd_enable:-"YES"}
+if test -n ${samba_enable=""} && checkyesno samba_enable; then
+    nmbd_enable=${nmbd_enable="YES"}
+    smbd_enable=${smbd_enable="YES"}
 %%WINBIND%%    # Check that winbind is actually configured
 %%WINBIND%%    if [ "`egrep -i '(idmap.*uid|winbind.*uid)' ${samba_config} 2>/dev/null | egrep -v [\#\;]`" ]; then
 %%WINBIND%%	winbindd_enable="YES"
 %%WINBIND%%    fi
 fi
 
-# Hack until run_rc_command() get rid of exit()
-samba_stop() {
-    pid=$(check_pidfile ${pidfile} ${command})
-    if [ -z ${pid} ]; then
-	echo "${name} not running? (check ${pidfile})."
-	return 1
-    fi
-    echo "Stopping ${command}."
-    kill -${sig_stop:-TERM} ${pid}
-    [ $? -ne 0 ] && [ -z "$rc_force" ] && return 1
-    wait_for_pids ${pid}
-}
-
 nmbd_precmd() {
     # XXX: Never delete winbindd_idmap, winbindd_cache and group_mapping
     if [ -d "%%SAMBA_LOCKDIR%%" ]; then
@@ -80,10 +67,9 @@ command="%%PREFIX%%/sbin/${name}"
 required_dirs="%%SAMBA_LOCKDIR%%"
 pidfile=%%SAMBA_RUNDIR%%/${name}.pid
 start_precmd="nmbd_precmd"
-stop_cmd="samba_stop"
 # Defaults
-nmbd_enable=${nmbd_enable:-"NO"}
-nmbd_flags=${nmbd_flags:-"-D"}
+nmbd_enable=${nmbd_enable="NO"}
+nmbd_flags=${nmbd_flags="-D"}
 command_args="-s ${samba_config}"
 
 load_rc_config $name
@@ -96,10 +82,9 @@ rcvar=`set_rcvar`
 command="%%PREFIX%%/sbin/${name}"
 pidfile=%%SAMBA_RUNDIR%%/${name}.pid
 start_precmd=":"
-stop_cmd="samba_stop"
 # Defaults
-smbd_enable=${smbd_enable:-"NO"}
-smbd_flags=${smbd_flags:-"-D"}
+smbd_enable=${smbd_enable="NO"}
+smbd_flags=${smbd_flags="-D"}
 command_args="-s ${samba_config}"
 
 load_rc_config $name
@@ -113,10 +98,9 @@ run_rc_command "$1"
 %%WINBIND%%required_dirs="%%SAMBA_LOCKDIR%%"
 %%WINBIND%%pidfile=%%SAMBA_RUNDIR%%/${name}.pid
 %%WINBIND%%start_precmd=":"
-%%WINBIND%%stop_cmd="samba_stop"
 %%WINBIND%%# Defaults
-%%WINBIND%%winbindd_enable=${winbindd_enable:-"NO"}
-%%WINBIND%%winbindd_flags=${winbindd_flags:-""}
+%%WINBIND%%winbindd_enable=${winbindd_enable="NO"}
+%%WINBIND%%winbindd_flags=${winbindd_flags=""}
 %%WINBIND%%command_args="-s ${samba_config}"
 %%WINBIND%%
 %%WINBIND%%load_rc_config $name
diff --git a/net/samba3/files/smb.conf.default b/net/samba3/files/smb.conf.sample.in
index 3bc81ba5dca..d667e88521e 100644
--- a/net/samba3/files/smb.conf.default
+++ b/net/samba3/files/smb.conf.sample.in
@@ -96,7 +96,7 @@
 # and the manual pages for details.
 # You may want to add the following on a Linux system:
 #         SO_RCVBUF=8192 SO_SNDBUF=8192
-   socket options = TCP_NODELAY
+;   socket options = TCP_NODELAY
 
 # Configure Samba to use multiple interfaces
 # If you have multiple network interfaces then you must list them