diff options
| author | Andrew Tridgell <tridge@samba.org> | 1996-10-02 15:41:30 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1996-10-02 15:41:30 +0000 |
| commit | afd08462ad5ff6b3c4bf621e39c55853a608175e (patch) | |
| tree | fdbaf287628ee046f0db73dd13611a03089fb47b /source3/smbd/reply.c | |
| parent | 5a2f52b79e28530c454cb488a44588147640f061 (diff) | |
| download | samba-afd08462ad5ff6b3c4bf621e39c55853a608175e.tar.gz samba-afd08462ad5ff6b3c4bf621e39c55853a608175e.tar.bz2 samba-afd08462ad5ff6b3c4bf621e39c55853a608175e.zip | |
backout all the changes to nmbd.
The 1.9.16 tree is now back to 1.9.16p2 as far as nmbd is concerned
apart from a small change that fixes the announce type in two places.
(This used to be commit 45e66a69d320024877c8b13f12b21bf895e04410)
Diffstat (limited to 'source3/smbd/reply.c')
| -rw-r--r-- | source3/smbd/reply.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index b99aef7528..b6c2313bf4 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -37,7 +37,6 @@ extern connection_struct Connections[]; extern files_struct Files[]; extern BOOL case_sensitive; extern pstring sesssetup_user; -extern fstring local_machine; extern int Client; /* this macro should always be used to extract an fnum (smb_fid) from @@ -55,6 +54,7 @@ int reply_special(char *inbuf,char *outbuf) int msg_flags = CVAL(inbuf,1); pstring name1,name2; extern fstring remote_machine; + extern fstring local_machine; char *p; *name1 = *name2 = 0; @@ -319,14 +319,6 @@ int reply_sesssetup_and_X(char *inbuf,char *outbuf,int length,int bufsize) BOOL guest=False; BOOL computer_id=False; - char domain[17]; - - char *work_alias = conf_alias_to_workgroup(local_machine); /* look-up */ - - if (work_alias) - StrnCpy(domain, work_alias, 16); - else - StrnCpy(domain, lp_workgroup(), 16); *smb_apasswd = 0; sess_uid = SVAL(inbuf,smb_uid); @@ -460,7 +452,7 @@ int reply_sesssetup_and_X(char *inbuf,char *outbuf,int length,int bufsize) p = smb_buf(outbuf); strcpy(p,"Unix"); p = skip_string(p,1); strcpy(p,"Samba "); strcat(p,VERSION); p = skip_string(p,1); - strcpy(p,domain); p = skip_string(p,1); + strcpy(p,lp_workgroup()); p = skip_string(p,1); set_message(outbuf,3,PTR_DIFF(p,smb_buf(outbuf)),False); /* perhaps grab OS version here?? */ } |