summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1998-12-09 06:35:37 +0000
committerAndrew Tridgell <tridge@samba.org>1998-12-09 06:35:37 +0000
commitcfba976fc234a4b9f1712d42dca405b25b314401 (patch)
tree7a0c385579632459d58a067a4538c4e574e230b7
parent7135fb0a2c869169996206a9c1cf5ac1112b9f0a (diff)
downloadsamba-cfba976fc234a4b9f1712d42dca405b25b314401.tar.gz
samba-cfba976fc234a4b9f1712d42dca405b25b314401.tar.bz2
samba-cfba976fc234a4b9f1712d42dca405b25b314401.zip
removed the SID stuff from the head branch as well.
This allows the removal of PASSDB_OBJ, RPC_CLIENT_OBJ and RPC_PARSE_OBJ from nmbd in the head branch. so nmbd just went on a diet :) (This used to be commit be697c9ef00f1b6366228dcdd3983d68158dd94f)
-rw-r--r--source3/Makefile.in2
-rw-r--r--source3/nmbd/nmbd.c12
-rw-r--r--source3/nmbd/nmbd_processlogon.c28
3 files changed, 6 insertions, 36 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 88b0168cda..421084bff4 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -197,7 +197,7 @@ NMBD_OBJ1 = nmbd/asyncdns.o nmbd/nmbd.o nmbd/nmbd_become_dmb.o \
nmbd/nmbd_workgroupdb.o nmbd/nmbd_synclists.o
NMBD_OBJ = $(NMBD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) \
- $(PASSDB_OBJ) $(LIB_OBJ) $(RPC_CLIENT_OBJ) $(RPC_PARSE_OBJ)
+ $(LIB_OBJ)
SWAT_OBJ = web/cgi.o web/diagnose.o web/startstop.o web/statuspage.o \
web/swat.o $(LIBSMB_OBJ) $(LOCKING_OBJ) \
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index a81f9e4bfe..d44fe5507c 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -677,18 +677,6 @@ static void usage(char *pname)
reload_services( True );
- if (!pwdb_initialise(False))
- {
- exit(1);
- }
-
- if (!get_member_domain_sid())
- {
- DEBUG(0,("ERROR: Samba cannot obtain PDC SID from PDC(s) %s.\n",
- lp_passwordserver()));
- exit(1);
- }
-
set_samba_nb_type();
if (!is_daemon && !is_a_socket(0))
diff --git a/source3/nmbd/nmbd_processlogon.c b/source3/nmbd/nmbd_processlogon.c
index 3f519ecfc9..4281068341 100644
--- a/source3/nmbd/nmbd_processlogon.c
+++ b/source3/nmbd/nmbd_processlogon.c
@@ -44,7 +44,6 @@ void process_logon_packet(struct packet_struct *p,char *buf,int len,
pstring outbuf;
int code;
uint16 token = 0;
-
uint32 ntversion;
uint16 lmnttoken;
uint16 lm20token;
@@ -53,7 +52,6 @@ void process_logon_packet(struct packet_struct *p,char *buf,int len,
char *uniuser; /* Unicode user name. */
pstring ascuser;
char *unicomp; /* Unicode computer name. */
- struct smb_passwd *smb_pass; /* To check if machine account exists */
memset(outbuf, 0, sizeof(outbuf));
@@ -196,7 +194,8 @@ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x lm_20 token=%x\n",
DEBUG(3,("process_logon_packet: SAMLOGON sidsize %d ntv %d\n", domainsidsize, ntversion));
/*
- * If MACHINE$ is in our password database then respond, else ignore.
+ * we respond regadless of whether the machine is in our password
+ * database. If it isn't then we let smbd send an appropriate error.
* Let's ignore the SID.
*/
@@ -206,26 +205,9 @@ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x lm_20 token=%x\n",
fstrcpy(reply_name,"\\\\"); /* Here it wants \\LOGONSERVER. */
fstrcpy(reply_name+2,my_name);
- smb_pass = getsmbpwnam(ascuser);
-
- if(!smb_pass )
- {
- DEBUG(3,("process_logon_packet: SAMLOGON request from %s(%s) for %s, not in password file\n",
- unistr(unicomp),inet_ntoa(p->ip), ascuser));
- return;
- }
- else if(smb_pass->acct_ctrl & ACB_DISABLED)
- {
- DEBUG(3,("process_logon_packet: SAMLOGON request from %s(%s) for %s, accound disabled.\n",
- unistr(unicomp),inet_ntoa(p->ip), ascuser));
- return;
- }
- else
- {
- DEBUG(3,("process_logon_packet: SAMLOGON request from %s(%s) for %s, returning logon svr %s domain %s code %x token=%x\n",
- unistr(unicomp),inet_ntoa(p->ip), ascuser, reply_name, global_myworkgroup,
- SAMLOGON_R ,lmnttoken));
- }
+ DEBUG(3,("process_logon_packet: SAMLOGON request from %s(%s) for %s, returning logon svr %s domain %s code %x token=%x\n",
+ unistr(unicomp),inet_ntoa(p->ip), ascuser, reply_name, global_myworkgroup,
+ SAMLOGON_R ,lmnttoken));
/* Construct reply. */