final part of "first" phase converting over to msrpc daemon architecture.

done a minimal amout of clean-up in the Makefile, removing unnecessary
modules from the link stage.  this is not complete, yet, and will
involve some changes, for example to smbd, to remove dependencies on
the password database API that shouldn't be there.  for example,
smbd should not ever call getsmbpwXXX() it should call the Samr or Lsa
API.

this first implementation has minor problems with not reinstantiating
the same services as the caller.  the "homes" service is a good example.
(This used to be commit caa50525220b0d0250fa139367593c2de2c12135)

1 files changed, 34 insertions, 559 deletions

diff --git a/source3/lsarpcd/lsarpcd.c b/source3/lsarpcd/lsarpcd.c
index ed665e85c5..050a593eb0 100644
--- a/source3/lsarpcd/lsarpcd.c
+++ b/source3/lsarpcd/lsarpcd.c
@@ -20,201 +20,52 @@
 */
 
 #include "includes.h"
-#include "trans2.h"
+
+fstring pipe_name;
 
 pstring servicesf = CONFIGFILE;
 extern pstring debugf;
-extern pstring global_myname;
-
-int am_parent = 1;
-
-/* the last message the was processed */
-int last_message = -1;
-
-/* a useful macro to debug the last message processed */
-#define LAST_MESSAGE() smb_fn_name(last_message)
-
-extern pstring scope;
+extern BOOL append_log;
 extern int DEBUGLEVEL;
 
-extern fstring remote_machine;
-extern pstring myhostname;
-
-extern pstring OriginalDir;
-
-/****************************************************************************
-  when exiting, take the whole family
-****************************************************************************/
-static void *dflt_sig(void)
-{
-	exit_server("caught signal");
-	return NULL;
-}
-
-/****************************************************************************
-  Send a SIGTERM to our process group.
-*****************************************************************************/
-static void  killkids(void)
-{
-	if(am_parent) kill(0,SIGTERM);
-}
-
-
-/****************************************************************************
-  open and listen to a socket
-****************************************************************************/
-static int open_server_socket(void)
+void msrpc_service_init(void)
 {
-	int s;
-	fstring dir;
-	fstring path;
-
-	slprintf(dir, sizeof(dir)-1, "/tmp/.msrpc");
-	slprintf(path, sizeof(path)-1, "%s/lsarpc", dir);
-
-	s = create_pipe_socket(dir, 0777, path, 0777);
-
-	if (s == -1)
-		return -1;
-		/* ready to listen */
-	if (listen(s, 5) == -1) {
-		DEBUG(0,("listen: %s\n", strerror(errno)));
-		close(s);
-		return -1;
+	if (!pwdb_initialise(True))
+	{
+		exit(-1);
 	}
-	return s;
-}
 
-/****************************************************************************
-  open the socket communication
-****************************************************************************/
-static BOOL open_sockets(BOOL is_daemon)
-{
-	extern int Client;
-	int num_interfaces = iface_count();
-	int fd_listenset;
-	fd_set listen_set;
-	int s;
-
-	memset(&fd_listenset, 0, sizeof(fd_listenset));
-
-#ifdef HAVE_ATEXIT
+	if(!initialise_sam_password_db())
 	{
-		static int atexit_set;
-		if(atexit_set == 0) {
-			atexit_set=1;
-			atexit(killkids);
-		}
+		exit(-1);
 	}
-#endif
 
-	/* Stop zombies */
-	CatchChild();
-		
-		
-	FD_ZERO(&listen_set);
-
-	/* Just bind to 0.0.0.0 - accept connections
-	   from anywhere. */
-	num_interfaces = 1;
-	
-	/* open an incoming socket */
-	s = open_server_socket();
-	if (s == -1)
-		return(False);
-	fd_listenset = s;
-	FD_SET(s,&listen_set);
-
-	/* now accept incoming connections - forking a new process
-	   for each incoming connection */
-	DEBUG(2,("waiting for a connection\n"));
-	while (1)
+	if(!initialise_passgrp_db())
 	{
-		struct sockaddr_un addr;
-		int in_addrlen = sizeof(addr);
-		fd_set lfds;
-		int num;
-		
-		memcpy((char *)&lfds, (char *)&listen_set, 
-		       sizeof(listen_set));
-		
-		num = sys_select(256,&lfds,NULL, NULL);
-		
-		if (num == -1 && errno == EINTR)
-			continue;
-		
-		/* Find the sockets that are read-ready -
-		   accept on these. */
-			
-		s = -1;
-		if(FD_ISSET(fd_listenset,&lfds))
-		{
-			s = fd_listenset;
-		}
-
-		/* Clear this so we don't look at it again. */
-		FD_CLR(s,&lfds);
-
-		Client = accept(s,(struct sockaddr*)&addr,&in_addrlen);
-		
-		if (Client == -1 && errno == EINTR)
-			continue;
-		
-		if (Client == -1)
-		{
-			DEBUG(0,("open_sockets: accept: %s\n",
-				 strerror(errno)));
-			continue;
-		}
-		
-		if (Client != -1 && fork()==0)
-		{
-			/* Child code ... */
-			
-			/* close the listening socket(s) */
-			close(fd_listenset);
-			
-			/* close our standard file
-			   descriptors */
-			close_low_fds();
-			am_parent = 0;
-			
-			/* Reset global variables in util.c so
-			   that client substitutions will be
-			   done correctly in the process.  */
-			reset_globals_after_fork();
-
-			/*
-			 * Ensure this child has kernel oplock
-			 * capabilities, but not it's children.
-			 */
-			set_process_capability(KERNEL_OPLOCK_CAPABILITY, True);
-			set_inherited_process_capability(KERNEL_OPLOCK_CAPABILITY, False);
+		exit(-1);
+	}
 
-			return True; 
-		}
-		/* The parent doesn't need this socket */
-		close(Client); 
+	if(!initialise_group_db())
+	{
+		exit(-1);
+	}
 
-		/* Force parent to check log size after
-		 * spawning child.  Fix from
-		 * klausr@ITAP.Physik.Uni-Stuttgart.De.  The
-		 * parent lsarpcd will log to logserver.smb.  It
-		 * writes only two messages for each child
-		 * started/finished. But each child writes,
-		 * say, 50 messages also in logserver.smb,
-		 * begining with the debug_count of the
-		 * parent, before the child opens its own log
-		 * file logserver.client. In a worst case
-		 * scenario the size of logserver.smb would be
-		 * checked after about 50*50=2500 messages
-		 * (ca. 100kb).
-		 * */
-		force_check_log_size();
+	if(!initialise_alias_db())
+	{
+		exit(-1);
+	}
 
-	} /* end while 1 */
+	if(!initialise_builtin_db())
+	{
+		exit(-1);
+	}
 
-/* NOTREACHED	return True; */
+	if (!get_member_domain_sid())
+	{
+		DEBUG(0,("ERROR: Samba cannot obtain PDC SID from PDC(s) %s.\n",
+		          lp_passwordserver()));
+		exit(-1);
+	}
 }
 
 /****************************************************************************
@@ -242,8 +93,6 @@ BOOL reload_services(BOOL test)
 
 	ret = lp_load(servicesf,False,False,True);
 
-	load_printers();
-
 	/* perhaps the config filename is now set */
 	if (!test)
 		reload_services(True);
@@ -255,166 +104,11 @@ BOOL reload_services(BOOL test)
 	return(ret);
 }
 
-
-
-/****************************************************************************
-this prevents zombie child processes
-****************************************************************************/
-BOOL reload_after_sighup = False;
-
-static void sig_hup(int sig)
-{
-	BlockSignals(True,SIGHUP);
-	DEBUG(0,("Got SIGHUP\n"));
-
-	/*
-	 * Fix from <branko.cibej@hermes.si> here.
-	 * We used to reload in the signal handler - this
-	 * is a *BIG* no-no.
-	 */
-
-	reload_after_sighup = True;
-	BlockSignals(False,SIGHUP);
-}
-
-
-
-#if DUMP_CORE
-/*******************************************************************
-prepare to dump a core file - carefully!
-********************************************************************/
-static BOOL dump_core(void)
-{
-	char *p;
-	pstring dname;
-	pstrcpy(dname,debugf);
-	if ((p=strrchr(dname,'/'))) *p=0;
-	pstrcat(dname,"/corefiles");
-	mkdir(dname,0700);
-	sys_chown(dname,getuid(),getgid());
-	chmod(dname,0700);
-	if (chdir(dname)) return(False);
-	umask(~(0700));
-
-#ifdef HAVE_GETRLIMIT
-#ifdef RLIMIT_CORE
-	{
-		struct rlimit rlp;
-		getrlimit(RLIMIT_CORE, &rlp);
-		rlp.rlim_cur = MAX(4*1024*1024,rlp.rlim_cur);
-		setrlimit(RLIMIT_CORE, &rlp);
-		getrlimit(RLIMIT_CORE, &rlp);
-		DEBUG(3,("Core limits now %d %d\n",
-			 (int)rlp.rlim_cur,(int)rlp.rlim_max));
-	}
-#endif
-#endif
-
-
-	DEBUG(0,("Dumping core in %s\n",dname));
-	abort();
-	return(True);
-}
-#endif
-
-
-/****************************************************************************
-exit the server
-****************************************************************************/
-void exit_server(char *reason)
-{
-	static int firsttime=1;
-	extern char *last_inbuf;
-
-
-	if (!firsttime) exit(0);
-	firsttime = 0;
-
-	unbecome_user();
-	DEBUG(2,("Closing connections\n"));
-
-#ifdef WITH_DFS
-	if (dcelogin_atmost_once) {
-		dfs_unlogin();
-	}
-#endif
-
-	if (!reason) {   
-		int oldlevel = DEBUGLEVEL;
-		DEBUGLEVEL = 10;
-		if (last_inbuf)
-			show_msg(last_inbuf);
-		DEBUGLEVEL = oldlevel;
-		DEBUG(0,("===============================================================\n"));
-#if DUMP_CORE
-		if (dump_core()) return;
-#endif
-	}    
-
-	locking_end();
-
-	DEBUG(3,("Server exit (%s)\n", (reason ? reason : "")));
-#ifdef MEM_MAN
-	{
-		extern FILE *dbf;
-		smb_mem_write_verbose(dbf);
-		dbgflush();
-	}
-#endif
-	exit(0);
-}
-
-
-
-/****************************************************************************
-  initialise connect, service and file structs
-****************************************************************************/
-static void init_structs(void)
-{
-#if 0
-	conn_init();
-#endif
-	init_rpc_pipe_hnd(); /* for RPC pipes */
-	if (!init_policy_hnd(MAX_SERVER_POLICY_HANDLES)) 
-	{
-		exit_server("could not allocate policy handles\n");
-	}
-}
-
-/****************************************************************************
-usage on the program
-****************************************************************************/
-static void usage(char *pname)
-{
-	DEBUG(0,("Incorrect program usage - are you sure the command line is correct?\n"));
-
-	printf("Usage: %s [-D] [-p port] [-d debuglevel] ", pname);
-        printf("[-l log basename] [-s services file]\n" );
-	printf("Version %s\n",VERSION);
-	printf("\t-D                    become a daemon\n");
-	printf("\t-p port               listen on the specified port\n");
-	printf("\t-d debuglevel         set the debuglevel\n");
-	printf("\t-l log basename.      Basename for log/debug files\n");
-	printf("\t-s services file.     Filename of services file\n");
-	printf("\t-P                    passive only\n");
-	printf("\t-a                    append to log file (default)\n");
-	printf("\t-o                    overwrite log file, don't append\n");
-	printf("\t-i scope              NetBIOS scope to use (default none)\n");
-	printf("\n");
-}
-
-
 /****************************************************************************
   main program
 ****************************************************************************/
  int main(int argc,char *argv[])
 {
-	extern BOOL append_log;
-	/* shall I run as a daemon */
-	BOOL is_daemon = False;
-	int opt;
-	extern char *optarg;
-	
 #ifdef HAVE_SET_AUTH_PARAMETERS
 	set_auth_parameters(argc,argv);
 #endif
@@ -428,229 +122,10 @@ static void usage(char *pname)
 
 	TimeInit();
 
-	pstrcpy(debugf,LSARPCLOGFILE);  
-
-	pstrcpy(remote_machine, "lsarpcd");
-
+	fstrcpy(pipe_name, "lsarpc");
 	setup_logging(argv[0],False);
+	slprintf(debugf, sizeof(debugf), "%s/log.%s", LOGFILEBASE, pipe_name);
+	add_msrpc_command_processor( pipe_name, argv[0], api_ntlsa_rpc );
 
-	charset_initialise();
-
-	/* make absolutely sure we run as root - to handle cases where people
-	   are crazy enough to have it setuid */
-#ifdef HAVE_SETRESUID
-	setresuid(0,0,0);
-#else
-	setuid(0);
-	seteuid(0);
-	setuid(0);
-	seteuid(0);
-#endif
-
-	fault_setup((void (*)(void *))exit_server);
-	CatchSignal(SIGTERM , SIGNAL_CAST dflt_sig);
-
-	/* we are never interested in SIGPIPE */
-	BlockSignals(True,SIGPIPE);
-
-	/* we want total control over the permissions on created files,
-	   so set our umask to 0 */
-	umask(0);
-
-	dos_GetWd(OriginalDir);
-
-	init_uid();
-
-	/* this is for people who can't start the program correctly */
-	while (argc > 1 && (*argv[1] != '-')) {
-		argv++;
-		argc--;
-	}
-
-	while ( EOF != (opt = getopt(argc, argv, "i:l:s:d:Dh?Paof:")) )
-		switch (opt)  {
-		case 'i':
-			pstrcpy(scope,optarg);
-			break;
-
-		case 'P':
-			{
-				extern BOOL passive;
-				passive = True;
-			}
-			break;	
-
-		case 's':
-			pstrcpy(servicesf,optarg);
-			break;
-
-		case 'l':
-			pstrcpy(debugf,optarg);
-			break;
-
-		case 'a':
-			append_log = True;
-			break;
-
-		case 'o':
-			append_log = False;
-			break;
-
-		case 'D':
-			is_daemon = True;
-			break;
-
-		case 'd':
-			if (*optarg == 'A')
-				DEBUGLEVEL = 10000;
-			else
-				DEBUGLEVEL = atoi(optarg);
-			break;
-
-		case 'h':
-		case '?':
-			usage(argv[0]);
-			exit(0);
-			break;
-
-		default:
-			usage(argv[0]);
-			exit(1);
-		}
-
-	reopen_logs();
-
-	DEBUG(1,( "lsarpcd version %s started.\n", VERSION));
-	DEBUGADD(1,( "Copyright Andrew Tridgell 1992-1999\n"));
-
-	DEBUG(2,("uid=%d gid=%d euid=%d egid=%d\n",
-		 (int)getuid(),(int)getgid(),(int)geteuid(),(int)getegid()));
-
-	if (sizeof(uint16) < 2 || sizeof(uint32) < 4) {
-		DEBUG(0,("ERROR: Samba is not configured correctly for the word size on your machine\n"));
-		exit(1);
-	}
-
-	get_myname(myhostname,NULL);
-
-	if (!reload_services(False))
-		return(-1);	
-
-	init_structs();
-
-#ifdef WITH_PROFILE
-	if (!profile_setup(False)) {
-		DEBUG(0,("ERROR: failed to setup profiling\n"));
-		return -1;
-	}
-#endif
-
-	/*
-	 * Set the machine NETBIOS name if not already
-	 * set from the config file.
-	 */
-	if (!*global_myname)
-	{
-		fstrcpy(global_myname, dns_to_netbios_name(myhostname));
-	}
-	strupper(global_myname);
-
-	add_msrpc_command_processor( "lsarpc",   argv[0],   api_ntlsa_rpc );
-
-	codepage_initialise(lp_client_code_page());
-
-	if (!pwdb_initialise(True))
-	{
-		exit(1);
-	}
-
-	if(!initialise_sam_password_db())
-	{
-		exit(1);
-	}
-
-	if(!initialise_passgrp_db())
-	{
-		exit(1);
-	}
-
-	if(!initialise_group_db())
-	{
-		exit(1);
-	}
-
-	if(!initialise_alias_db())
-	{
-		exit(1);
-	}
-
-	if(!initialise_builtin_db())
-	{
-		exit(1);
-	}
-
-	if (!get_member_domain_sid())
-	{
-		DEBUG(0,("ERROR: Samba cannot obtain PDC SID from PDC(s) %s.\n",
-		          lp_passwordserver()));
-		exit(1);
-	}
-
-	CatchSignal(SIGHUP,SIGNAL_CAST sig_hup);
-	
-	/* Setup the signals that allow the debug log level
-	   to by dynamically changed. */
- 
-	/* If we are using the malloc debug code we can't use
-	   SIGUSR1 and SIGUSR2 to do debug level changes. */
-	
-#ifndef MEM_MAN
-#if defined(SIGUSR1)
-	CatchSignal( SIGUSR1, SIGNAL_CAST sig_usr1 );
-#endif /* SIGUSR1 */
-   
-#if defined(SIGUSR2)
-	CatchSignal( SIGUSR2, SIGNAL_CAST sig_usr2 );
-#endif /* SIGUSR2 */
-#endif /* MEM_MAN */
-
-	DEBUG(3,( "loaded services\n"));
-
-	if (!is_daemon && !is_a_socket(0)) {
-		DEBUG(0,("standard input is not a socket, assuming -D option\n"));
-		is_daemon = True;
-	}
-
-	if (is_daemon) {
-		DEBUG( 3, ( "Becoming a daemon.\n" ) );
-		become_daemon();
-	}
-
-	if (!directory_exist(lp_lockdir(), NULL)) {
-		mkdir(lp_lockdir(), 0755);
-	}
-
-	if (is_daemon) {
-		pidfile_create("lsarpcd");
-	}
-
-	if (!open_sockets(is_daemon))
-		exit(1);
-
-	if (!locking_init(0))
-		exit(1);
-
-	/* possibly reload the services file. */
-	reload_services(True);
-	
-	if (*lp_rootdir()) {
-		if (sys_chroot(lp_rootdir()) == 0)
-			DEBUG(2,("Changed root to %s\n", lp_rootdir()));
-	}
-
-	lsarpcd_process();
-	close_sockets();
-	
-	exit_server("normal exit");
-	return(0);
+	return msrpc_main(argc, argv);
 }