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)

2 files changed, 72 insertions, 29 deletions

diff --git a/source3/include/proto.h b/source3/include/proto.h
index db5aa0b9b4..4ac79a02fd 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -3,6 +3,11 @@
 /* This file is automatically generated with "make proto". DO NOT EDIT */
 
 
+/*The following definitions come from  browserd/browserd.c  */
+
+void msrpc_service_init(void);
+BOOL reload_services(BOOL test);
+
 /*The following definitions come from  client/client.c  */
 
 void do_list(const char *mask,uint16 attribute,void (*fn)(file_info *),BOOL rec, BOOL dirs);
@@ -526,6 +531,17 @@ void reg_get_subkey(char *full_keyname, char *key_name, char *subkey_name);
 BOOL reg_split_key(const char *full_keyname, uint32 *reg_type, char *key_name);
 BOOL become_user_permanently(uid_t uid, gid_t gid);
 char *get_trusted_serverlist(const char* domain);
+char *pwdb_encode_acct_ctrl(uint16 acct_ctrl, size_t length);
+uint16 pwdb_decode_acct_ctrl(const char *p);
+time_t pwdb_get_last_set_time(const char *p);
+void pwdb_set_logon_time(char *p, int max_len, time_t t);
+void pwdb_set_logoff_time(char *p, int max_len, time_t t);
+void pwdb_set_kickoff_time(char *p, int max_len, time_t t);
+void pwdb_set_can_change_time(char *p, int max_len, time_t t);
+void pwdb_set_must_change_time(char *p, int max_len, time_t t);
+void pwdb_set_last_set_time(char *p, int max_len, time_t t);
+void pwdb_sethexpwd(char *p, const char *pwd, uint16 acct_ctrl);
+BOOL pwdb_gethexpwd(const char *p, char *pwd, uint32 *acct_ctrl);
 
 /*The following definitions come from  lib/util_array.c  */
 
@@ -601,17 +617,6 @@ uint32 lookup_wk_user_name(const char *user_name, const char *domain,
 				DOM_SID *sid, uint8 *type);
 uint32 lookup_builtin_alias_name(const char *alias_name, const char *domain,
 				DOM_SID *sid, uint8 *type);
-char *pwdb_encode_acct_ctrl(uint16 acct_ctrl, size_t length);
-uint16 pwdb_decode_acct_ctrl(const char *p);
-time_t pwdb_get_last_set_time(const char *p);
-void pwdb_set_logon_time(char *p, int max_len, time_t t);
-void pwdb_set_logoff_time(char *p, int max_len, time_t t);
-void pwdb_set_kickoff_time(char *p, int max_len, time_t t);
-void pwdb_set_can_change_time(char *p, int max_len, time_t t);
-void pwdb_set_must_change_time(char *p, int max_len, time_t t);
-void pwdb_set_last_set_time(char *p, int max_len, time_t t);
-void pwdb_sethexpwd(char *p, const char *pwd, uint16 acct_ctrl);
-BOOL pwdb_gethexpwd(const char *p, char *pwd, uint32 *acct_ctrl);
 BOOL pwdb_initialise(BOOL is_server);
 char *lookup_wk_alias_rid(uint32 rid);
 char *lookup_wk_user_rid(uint32 rid);
@@ -1034,15 +1039,8 @@ struct shmem_ops *sysv_shm_open(int ronly);
 
 /*The following definitions come from  lsarpcd/lsarpcd.c  */
 
+void msrpc_service_init(void);
 BOOL reload_services(BOOL test);
-void exit_server(char *reason);
-
-/*The following definitions come from  lsarpcd/lsarpcd_process.c  */
-
-BOOL receive_next_smb(char *inbuf, int bufsize, int timeout);
-void process_smb(char *inbuf, char *outbuf);
-BOOL get_user_creds(struct user_creds *usr);
-void lsarpcd_process(void);
 
 /*The following definitions come from  mem_man/mem_man.c  */
 
@@ -1061,6 +1059,22 @@ void smb_mem_write_errors(FILE *outfile);
 void smb_mem_set_multiplier(int multiplier);
 void *smb_mem_resize(void *ptr,size_t newsize);
 
+/*The following definitions come from  msrpc/msrpcd.c  */
+
+void exit_server(char *reason);
+int msrpc_main(int argc,char *argv[]);
+
+/*The following definitions come from  msrpc/msrpcd_process.c  */
+
+BOOL get_user_creds(int c, struct user_creds *usr);
+BOOL msrpcd_init(int c, pipes_struct *p);
+void msrpcd_process(int c, pipes_struct *p);
+
+/*The following definitions come from  netlogond/netlogond.c  */
+
+void msrpc_service_init(void);
+BOOL reload_services(BOOL test);
+
 /*The following definitions come from  nmbd/asyncdns.c  */
 
 int asyncdns_fd(void);
@@ -2008,10 +2022,6 @@ BOOL cli_net_sam_sync( const char* srv_name, const char* myhostname,
 				SAM_DELTA_HDR *hdr_deltas,
 				SAM_DELTA_CTR *deltas);
 
-/*The following definitions come from  rpc_client/cli_netlogon_sync.c  */
-
-BOOL synchronise_passdb(void);
-
 /*The following definitions come from  rpc_client/cli_pipe.c  */
 
 BOOL create_rpc_bind_resp(struct pwd_info *pwd,
@@ -2278,6 +2288,14 @@ BOOL msrpc_lsa_query_secret(const char* srv_name,
 				STRING2 *secret,
 				NTTIME *last_update);
 
+/*The following definitions come from  rpc_client/msrpc_netlogon.c  */
+
+BOOL check_domain_security(char *orig_user, char *domain, 
+				uchar *challenge,
+				char *smb_apasswd, int smb_apasslen,
+				char *smb_ntpasswd, int smb_ntpasslen,
+				uchar user_sess_key[16]);
+
 /*The following definitions come from  rpc_client/msrpc_samr.c  */
 
 BOOL req_user_info( const POLICY_HND *pol_dom,
@@ -4046,6 +4064,11 @@ void display_sam_sync(FILE *out_hnd, enum action_type action,
 
 void readline_init(void);
 
+/*The following definitions come from  samrd/samrd.c  */
+
+void msrpc_service_init(void);
+BOOL reload_services(BOOL test);
+
 /*The following definitions come from  smbd/blocking.c  */
 
 BOOL push_blocking_lock_request( char *inbuf, int length, int lock_timeout, int lock_num);
@@ -4274,11 +4297,6 @@ struct cli_state *server_cryptkey(void);
 BOOL server_validate(char *user, char *domain, 
 		     char *pass, int passlen,
 		     char *ntpass, int ntpasslen);
-BOOL domain_client_validate( char *user, char *domain, 
-				char *acct_name, uint16 acct_type,
-				char *smb_apasswd, int smb_apasslen, 
-				char *smb_ntpasswd, int smb_ntpasslen,
-				uchar user_sess_key[16]);
 
 /*The following definitions come from  smbd/pipes.c  */
 
@@ -4533,6 +4551,21 @@ int smbw_stat_printjob(struct smbw_server *srv,char *path,
 int smbw_fstat(int fd, struct stat *st);
 int smbw_stat(const char *fname, struct stat *st);
 
+/*The following definitions come from  spoolssd/spoolssd.c  */
+
+void msrpc_service_init(void);
+BOOL reload_services(BOOL test);
+
+/*The following definitions come from  srvsvcd/srvsvcd.c  */
+
+void msrpc_service_init(void);
+BOOL reload_services(BOOL test);
+
+/*The following definitions come from  svcctld/svcctld.c  */
+
+void msrpc_service_init(void);
+BOOL reload_services(BOOL test);
+
 /*The following definitions come from  web/cgi.c  */
 
 void cgi_load_variables(FILE *f1);
@@ -4565,4 +4598,14 @@ void status_page(void);
 
 /*The following definitions come from  web/swat.c  */
 
+
+/*The following definitions come from  winregd/winregd.c  */
+
+void msrpc_service_init(void);
+BOOL reload_services(BOOL test);
+
+/*The following definitions come from  wkssvcd/wkssvcd.c  */
+
+void msrpc_service_init(void);
+BOOL reload_services(BOOL test);
 #endif /* _PROTO_H_ */
diff --git a/source3/include/smb.h b/source3/include/smb.h
index b06cfe2b7b..43c5dc6bb1 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -255,7 +255,7 @@ typedef char fstring[FSTRING_LEN];
 #define PIPE_WINREG   "\\PIPE\\winreg"
 #define PIPE_WKSSVC   "\\PIPE\\wkssvc"
 #define PIPE_NETLOGON "\\PIPE\\NETLOGON"
-#define PIPE_SVCCTL   "\\PIPE\\SVCCTL"
+#define PIPE_SVCCTL   "\\PIPE\\svcctl"
 #define PIPE_NTLSA    "\\PIPE\\ntlsa"
 #define PIPE_NTSVCS   "\\PIPE\\ntsvcs"
 #define PIPE_LSASS    "\\PIPE\\lsass"