Rename smbd -> samba.

This reverts commit 05ea5e23cf4e70de0bd658b1c5c0ead133967091.

Conflicts:

	source4/smbd/server.c

21 files changed, 53 insertions, 56 deletions

diff --git a/source4/build/smb_build/summary.pm b/source4/build/smb_build/summary.pm
index 4ea1ad525e..f6c1c50550 100644
--- a/source4/build/smb_build/summary.pm
+++ b/source4/build/smb_build/summary.pm
@@ -46,7 +46,7 @@ sub show($$)
 
 	print "Summary:\n\n";
 	showitem($output, "SSL in SWAT and LDAP", ["GNUTLS"]);
-	showitem($output, "threads in smbd (see --with-pthread)", ["PTHREAD"]);
+	showitem($output, "threads in server (see --with-pthread)", ["PTHREAD"]);
 	showitem($output, "intelligent command line editing", ["READLINE"]);
 	showitem($output, "changing process titles (see --with-setproctitle)", ["SETPROCTITLE"]);
 	showitem($output, "using extended attributes", ["XATTR"]);
diff --git a/source4/cldap_server/config.mk b/source4/cldap_server/config.mk
index 137a44d0f7..baf2620f32 100644
--- a/source4/cldap_server/config.mk
+++ b/source4/cldap_server/config.mk
@@ -4,7 +4,7 @@
 # Start SUBSYSTEM CLDAPD
 [MODULE::CLDAPD]
 INIT_FUNCTION = server_service_cldapd_init
-SUBSYSTEM = smbd
+SUBSYSTEM = samba
 PRIVATE_DEPENDENCIES = \
 		LIBCLI_CLDAP LIBNETIF process_model
 # End SUBSYSTEM CLDAPD
diff --git a/source4/cluster/ctdb/example/cluster_start.sh b/source4/cluster/ctdb/example/cluster_start.sh
index 575d031c95..825eadb483 100755
--- a/source4/cluster/ctdb/example/cluster_start.sh
+++ b/source4/cluster/ctdb/example/cluster_start.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 
-killall smbd
+killall samba
 sleep 1
-killall -9 smbd
+killall -9 samba
 killall -9 valgrind
 
 type=$1
 
-xterm -e $type bin/smbd -s /home/tridge/samba/samba4.svn/prefix/etc/smb.conf.node1 -M single -i &
-xterm -e $type bin/smbd -s /home/tridge/samba/samba4.svn/prefix/etc/smb.conf.node2 -M single -i &
+xterm -e $type bin/samba -s /home/tridge/samba/samba4.svn/prefix/etc/smb.conf.node1 -M single -i &
+xterm -e $type bin/samba -s /home/tridge/samba/samba4.svn/prefix/etc/smb.conf.node2 -M single -i &
 
diff --git a/source4/dsdb/config.mk b/source4/dsdb/config.mk
index 63e8a77ce4..8bc8b6e000 100644
--- a/source4/dsdb/config.mk
+++ b/source4/dsdb/config.mk
@@ -46,7 +46,7 @@ $(eval $(call proto_header_template,$(dsdbsrcdir)/schema/proto.h,$(SAMDB_SCHEMA_
 # Start SUBSYSTEM DREPL_SRV
 [MODULE::DREPL_SRV]
 INIT_FUNCTION = server_service_drepl_init
-SUBSYSTEM = smbd
+SUBSYSTEM = samba
 PRIVATE_DEPENDENCIES = \
 		SAMDB \
 		process_model 
diff --git a/source4/dynconfig/config.mk b/source4/dynconfig/config.mk
index c0ef7f6e99..699c30e764 100644
--- a/source4/dynconfig/config.mk
+++ b/source4/dynconfig/config.mk
@@ -3,7 +3,7 @@
 DYNCONFIG_OBJ_FILES = $(dynconfigsrcdir)/dynconfig.o
 
 # set these to where to find various files
-# These can be overridden by command line switches (see smbd(8))
+# These can be overridden by command line switches (see samba(8))
 # or in smb.conf (see smb.conf(5))
 CONFIG4FILE = $(sysconfdir)/smb.conf
 PKGCONFIGDIR = $(libdir)/pkgconfig
diff --git a/source4/kdc/config.mk b/source4/kdc/config.mk
index 2c96e22cb3..b3e5bfdb92 100644
--- a/source4/kdc/config.mk
+++ b/source4/kdc/config.mk
@@ -4,7 +4,7 @@
 # Start SUBSYSTEM KDC
 [MODULE::KDC]
 INIT_FUNCTION = server_service_kdc_init
-SUBSYSTEM = smbd
+SUBSYSTEM = samba
 PRIVATE_DEPENDENCIES = \
 		HEIMDAL_KDC HDB_LDB
 # End SUBSYSTEM KDC
diff --git a/source4/ldap_server/config.mk b/source4/ldap_server/config.mk
index 65f5b17f9a..4c35117a72 100644
--- a/source4/ldap_server/config.mk
+++ b/source4/ldap_server/config.mk
@@ -4,7 +4,7 @@
 # Start SUBSYSTEM LDAP
 [MODULE::LDAP]
 INIT_FUNCTION = server_service_ldap_init
-SUBSYSTEM = smbd
+SUBSYSTEM = samba
 PRIVATE_DEPENDENCIES = CREDENTIALS \
 		LIBCLI_LDAP SAMDB \
 		process_model \
diff --git a/source4/nbt_server/config.mk b/source4/nbt_server/config.mk
index 1121bfc690..951949a43f 100644
--- a/source4/nbt_server/config.mk
+++ b/source4/nbt_server/config.mk
@@ -70,7 +70,7 @@ $(eval $(call proto_header_template,$(nbt_serversrcdir)/nbt_server_proto.h,$(NBT
 
 [MODULE::service_nbtd]
 INIT_FUNCTION = server_service_nbtd_init
-SUBSYSTEM = smbd
+SUBSYSTEM = samba
 PRIVATE_DEPENDENCIES = NBT_SERVER process_model
 
 service_nbtd_OBJ_FILES = \
diff --git a/source4/ntp_signd/config.mk b/source4/ntp_signd/config.mk
index 96e0de5583..3b52a200ce 100644
--- a/source4/ntp_signd/config.mk
+++ b/source4/ntp_signd/config.mk
@@ -4,7 +4,7 @@
 # Start SUBSYSTEM NTP_signd
 [MODULE::NTP_SIGND]
 INIT_FUNCTION = server_service_ntp_signd_init
-SUBSYSTEM = smbd
+SUBSYSTEM = samba
 PRIVATE_DEPENDENCIES = \
 		SAMDB NDR_NTP_SIGND
 # End SUBSYSTEM NTP_SIGND
diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk
index 6b1813544e..fb697d0c0f 100644
--- a/source4/rpc_server/config.mk
+++ b/source4/rpc_server/config.mk
@@ -206,7 +206,7 @@ PUBLIC_HEADERS += $(rpc_serversrcdir)/dcerpc_server.h
 
 [MODULE::DCESRV]
 INIT_FUNCTION = server_service_rpc_init
-SUBSYSTEM = smbd
+SUBSYSTEM = samba
 PRIVATE_DEPENDENCIES = dcerpc_server
 
 DCESRV_OBJ_FILES = $(rpc_serversrcdir)/service_rpc.o
diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk
index 5503a42cdd..2fcb71eb7a 100644
--- a/source4/selftest/config.mk
+++ b/source4/selftest/config.mk
@@ -52,30 +52,30 @@ testenv:: everything
 valgrindtest:: valgrindtest-all
 
 valgrindtest-quick:: all
-	SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
+	SMBD_VALGRIND="xterm -n server -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
 	VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
 	$(SELFTEST) $(SELFTEST_QUICK_OPTS) --immediate --socket-wrapper $(TESTS)
 
 valgrindtest-all:: everything
-	SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
+	SMBD_VALGRIND="xterm -n server -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
 	VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
 	$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --immediate --socket-wrapper $(TESTS)
 
 valgrindtest-env:: everything
-	SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
+	SMBD_VALGRIND="xterm -n server -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
 	VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
 	$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper --testenv
 
 gdbtest:: gdbtest-all
 
 gdbtest-quick:: all
-	SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
+	SMBD_VALGRIND="xterm -n server -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
 	$(SELFTEST) $(SELFTEST_QUICK_OPTS) --immediate --socket-wrapper $(TESTS)
 
 gdbtest-all:: everything
-	SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
+	SMBD_VALGRIND="xterm -n server -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
 	$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --immediate --socket-wrapper $(TESTS)
 
 gdbtest-env:: everything
-	SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
+	SMBD_VALGRIND="xterm -n server -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
 	$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper --testenv
diff --git a/source4/selftest/selftest.pl b/source4/selftest/selftest.pl
index 51a354c7a4..92aa67e8d3 100755
--- a/source4/selftest/selftest.pl
+++ b/source4/selftest/selftest.pl
@@ -303,7 +303,7 @@ Target Specific:
  --expected-failures=FILE   specify list of tests that is guaranteed to fail
 
 Samba4 Specific:
- --ldap=openldap|fedora-ds     back smbd onto specified ldap server
+ --ldap=openldap|fedora-ds     back samba onto specified ldap server
 
 Samba3 Specific:
  --bindir=PATH              path to binaries
@@ -809,7 +809,7 @@ if ($opt_testenv) {
 Welcome to the Samba4 Test environment '$testenv_name'
 
 This matches the client environment used in make test
-smbd is pid `cat \$PIDDIR/smbd.pid`
+server is pid `cat \$PIDDIR/samba.pid`
 
 Some useful environment variables:
 TORTURE_OPTIONS=\$TORTURE_OPTIONS
diff --git a/source4/selftest/target/Samba4.pm b/source4/selftest/target/Samba4.pm
index 992e251c35..9364008ee2 100644
--- a/source4/selftest/target/Samba4.pm
+++ b/source4/selftest/target/Samba4.pm
@@ -116,20 +116,20 @@ sub check_or_start($$$)
 		if (defined($ENV{SMBD_OPTIONS})) {
 			$optarg.= " $ENV{SMBD_OPTIONS}";
 		}
-		my $ret = system("$valgrind $self->{bindir}/smbd $optarg $env_vars->{CONFIGURATION} -M single -i --leak-report-full");
+		my $ret = system("$valgrind $self->{bindir}/samba $optarg $env_vars->{CONFIGURATION} -M single -i --leak-report-full");
 		if ($? == -1) {
-			print "Unable to start smbd: $ret: $!\n";
+			print "Unable to start samba: $ret: $!\n";
 			exit 1;
 		}
 		unlink($env_vars->{SMBD_TEST_FIFO});
 		my $exit = $? >> 8;
 		if ( $ret == 0 ) {
-			print "smbd exits with status $exit\n";
+			print "samba exits with status $exit\n";
 		} elsif ( $ret & 127 ) {
-			print "smbd got signal ".($ret & 127)." and exits with $exit!\n";
+			print "samba got signal ".($ret & 127)." and exits with $exit!\n";
 		} else {
 			$ret = $? >> 8;
-			print "smbd failed with status $exit!\n";
+			print "samba failed with status $exit!\n";
 		}
 		exit $exit;
 	}
@@ -498,7 +498,7 @@ sub provision($$$$$$)
 {
 	my ($self, $prefix, $server_role, $netbiosname, $netbiosalias, $swiface, $password) = @_;
 
-	my $smbd_loglevel = 1;
+	my $server_loglevel = 1;
 	my $username = "administrator";
 	my $domain = "SAMBADOMAIN";
 	my $realm = "SAMBA.EXAMPLE.COM";
@@ -571,7 +571,7 @@ sub provision($$$$$$)
 	ldb:nosync = true
 #We don't want to pass our self-tests if the PAC code is wrong
 	gensec:require_pac = true
-	log level = $smbd_loglevel
+	log level = $server_loglevel
 
 [tmp]
 	path = $tmpdir
@@ -606,7 +606,7 @@ sub provision($$$$$$)
 	cifs:server = $netbiosname
 	cifs:share = tmp
 #There is no username specified here, instead the client is expected
-#to log in with kerberos, and smbd will used delegated credentials.
+#to log in with kerberos, and the serverwill use delegated credentials.
 
 [simple]
 	path = $tmpdir
@@ -828,8 +828,8 @@ sub provision_dc($$)
 	$self->add_wins_config("$prefix/private") or 
 		die("Unable to add wins configuration");
 
-	$ret->{SMBD_TEST_FIFO} = "$prefix/smbd_test.fifo";
-	$ret->{SMBD_TEST_LOG} = "$prefix/smbd_test.log";
+	$ret->{SMBD_TEST_FIFO} = "$prefix/server_test.fifo";
+	$ret->{SMBD_TEST_LOG} = "$prefix/server_test.log";
 	$ret->{SMBD_TEST_LOG_POS} = 0;
 	return $ret;
 }
@@ -841,8 +841,8 @@ sub teardown_env($$)
 
 	close(DATA);
 
-	if (-f "$envvars->{PIDDIR}/smbd.pid" ) {
-		open(IN, "<$envvars->{PIDDIR}/smbd.pid") or die("unable to open smbd pid file");
+	if (-f "$envvars->{PIDDIR}/samba.pid" ) {
+		open(IN, "<$envvars->{PIDDIR}/samba.pid") or die("unable to open server pid file");
 		$pid = <IN>;
 		close(IN);
 
@@ -858,7 +858,7 @@ sub teardown_env($$)
 		
 		# If it is still around, kill it
 		if ($count > 20) {
-		    print "smbd process $pid took more than $count seconds to exit, killing\n";
+		    print "server process $pid took more than $count seconds to exit, killing\n";
 		    kill 9, $pid;
 		}
 	}
diff --git a/source4/selftest/test_win.sh b/source4/selftest/test_win.sh
index bc40620af5..17c09e6b26 100755
--- a/source4/selftest/test_win.sh
+++ b/source4/selftest/test_win.sh
@@ -32,7 +32,7 @@ name="NET against Windows 2003"
 testit "$name" smb $WINTEST_DIR/wintest_net.sh $SMBTORTURE_REMOTE_HOST \
 	$SMBTORTURE_USERNAME $SMBTORTURE_PASSWORD $SMBTORTURE_WORKGROUP
 
-name="Windows 2003 against smbd"
+name="Windows 2003 against samba"
 testit "$name" smb $WINTEST_DIR/wintest_client.sh $SMBTORTURE_REMOTE_HOST
 
 dc_tests="RPC-DRSUAPI ncacn_np ncacn_ip_tcp"
diff --git a/source4/smb_server/config.mk b/source4/smb_server/config.mk
index d1ec6d49e8..8ed03b17fe 100644
--- a/source4/smb_server/config.mk
+++ b/source4/smb_server/config.mk
@@ -2,7 +2,7 @@
 #
 [MODULE::SERVICE_SMB]
 INIT_FUNCTION = server_service_smb_init
-SUBSYSTEM = smbd
+SUBSYSTEM = samba
 PRIVATE_DEPENDENCIES = SMB_SERVER
 
 SERVICE_SMB_OBJ_FILES = $(smb_serversrcdir)/smb_server.o
diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk
index e60f444456..b5babd4d69 100644
--- a/source4/smbd/config.mk
+++ b/source4/smbd/config.mk
@@ -17,9 +17,7 @@ PIDFILE_OBJ_FILES = $(smbdsrcdir)/pidfile.o
 
 $(eval $(call proto_header_template,$(smbdsrcdir)/pidfile.h,$(PIDFILE_OBJ_FILES:.o=.c)))
 
-#################################
-# Start BINARY smbd
-[BINARY::smbd]
+[BINARY::samba]
 INSTALLDIR = SBINDIR
 PRIVATE_DEPENDENCIES = \
 		process_model \
@@ -36,8 +34,6 @@ PRIVATE_DEPENDENCIES = \
 		share \
 		CLUSTER
 
-smbd_OBJ_FILES = $(smbdsrcdir)/server.o
+samba_OBJ_FILES = $(smbdsrcdir)/server.o
 
-MANPAGES += $(smbdsrcdir)/smbd.8
-# End BINARY smbd
-#################################
+MANPAGES += $(smbdsrcdir)/samba.8
diff --git a/source4/smbd/smbd.8.xml b/source4/smbd/samba.8.xml
index a02c2ce80a..e1ec8cabd5 100644
--- a/source4/smbd/smbd.8.xml
+++ b/source4/smbd/samba.8.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
-<refentry id="smbd.8">
+<refentry id="samba.8">
 
 <refmeta>
-	<refentrytitle>smbd</refentrytitle>
+	<refentrytitle>samba</refentrytitle>
 	<manvolnum>8</manvolnum>
 </refmeta>
 
 
 <refnamediv>
-	<refname>smbd</refname>
+	<refname>samba</refname>
 	<refpurpose>server to provide filesharing- and directory services to clients</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 	<cmdsynopsis>
-		<command>smbd</command>
+		<command>samba</command>
 		<arg choice="opt">-i</arg>
 		<arg choice="opt">-M model</arg>
 	</cmdsynopsis>
@@ -26,7 +26,7 @@
 	<para>This program is part of the <citerefentry><refentrytitle>samba</refentrytitle>
 	<manvolnum>7</manvolnum></citerefentry> suite.</para>
 
-	<para><command>smbd</command> is the server daemon that 
+	<para><command>samba</command> is the server daemon that 
 	provides filesharing and directory services to Windows clients. 
 	The server provides filespace and directory services to
 	clients using the SMB (or CIFS) protocol and other 
@@ -51,8 +51,9 @@
 	<manvolnum>5</manvolnum></citerefentry> manual page should be regarded as mandatory reading before 
 	proceeding with installation.</para>
 
-	<para>As of Samba 4, smbd also incorporates all the functionality of 
-	nmbd.</para>
+	<para>As of Samba 4, there is a single daemon that incorporates the 
+		functionality of both smbd and nmbd that are present in older versions 
+		of Samba.</para>
 
 </refsect1>
 
@@ -66,7 +67,7 @@
 		server to run "interactively", not as a daemon, even if the
 		server is executed on the command line of a shell. Setting this
 		parameter negates the implicit deamon mode when run from the
-		command line. <command>smbd</command> also logs to standard
+		command line. <command>samba</command> also logs to standard
 		output, as if the <command>-S</command> parameter had been
 		given.
 		</para></listitem>
@@ -75,7 +76,7 @@
 		<varlistentry>
 		<term>-M model</term>
 		<listitem><para>This parameter can be used to specify the 
-		&quot;process model&quot; smbd should use. This determines 
+		&quot;process model&quot; samba should use. This determines 
 		how concurrent clients are handled. Available process 
 		models include <emphasis>single</emphasis> (everything in 
 		a single process), <emphasis>standard</emphasis> (similar 
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index cf25693fbe..fd4b21b17f 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -200,7 +200,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
 	extern NTSTATUS server_service_rpc_init(void);
 	extern NTSTATUS server_service_ntp_signd_init(void);
 	extern NTSTATUS server_service_samba3_smb_init(void);
-	init_module_fn static_init[] = { STATIC_smbd_MODULES };
+	init_module_fn static_init[] = { STATIC_samba_MODULES };
 	init_module_fn *shared_init;
 	struct event_context *event_ctx;
 	uint16_t stdin_event_flags;
diff --git a/source4/web_server/config.mk b/source4/web_server/config.mk
index af3ac5f544..e034590111 100644
--- a/source4/web_server/config.mk
+++ b/source4/web_server/config.mk
@@ -4,7 +4,7 @@
 # Start SUBSYSTEM WEB
 [MODULE::WEB]
 INIT_FUNCTION = server_service_web_init
-SUBSYSTEM = smbd
+SUBSYSTEM = samba
 PRIVATE_DEPENDENCIES = LIBTLS smbcalls process_model LIBPYTHON
 # End SUBSYSTEM WEB
 #######################
diff --git a/source4/winbind/config.mk b/source4/winbind/config.mk
index 1837c52891..f719f00853 100644
--- a/source4/winbind/config.mk
+++ b/source4/winbind/config.mk
@@ -4,7 +4,7 @@
 # Start SUBSYSTEM WINBIND
 [MODULE::WINBIND]
 INIT_FUNCTION = server_service_winbind_init
-SUBSYSTEM = smbd
+SUBSYSTEM = samba
 PRIVATE_DEPENDENCIES = \
 		WB_HELPER \
 		IDMAP \
diff --git a/source4/wrepl_server/config.mk b/source4/wrepl_server/config.mk
index 235a897503..c7b5c3e1df 100644
--- a/source4/wrepl_server/config.mk
+++ b/source4/wrepl_server/config.mk
@@ -4,7 +4,7 @@
 # Start SUBSYSTEM WREPL_SRV
 [MODULE::WREPL_SRV]
 INIT_FUNCTION = server_service_wrepl_init
-SUBSYSTEM = smbd
+SUBSYSTEM = samba
 PRIVATE_DEPENDENCIES = \
 		LIBCLI_WREPL WINSDB process_model 
 # End SUBSYSTEM WREPL_SRV