Rename smbd -> samba.

This reverts commit 05ea5e23cf4e70de0bd658b1c5c0ead133967091.

Conflicts:

	source4/smbd/server.c

3 files changed, 14 insertions, 17 deletions

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;