summaryrefslogtreecommitdiff
path: root/source3/client
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1996-10-02 14:09:22 +0000
committerAndrew Tridgell <tridge@samba.org>1996-10-02 14:09:22 +0000
commit5a2f52b79e28530c454cb488a44588147640f061 (patch)
tree1f412098bbcf050bce556d00f2c3fddd470746c9 /source3/client
parent11d9539d755d5c5accb4481577781b8b7bfeda50 (diff)
downloadsamba-5a2f52b79e28530c454cb488a44588147640f061.tar.gz
samba-5a2f52b79e28530c454cb488a44588147640f061.tar.bz2
samba-5a2f52b79e28530c454cb488a44588147640f061.zip
- a huge pile of changes from Luke which implement the browse.conf
stuff and also fix a pile of nmbd bugs. Unfortunately I found it very hard to disentangle the new features from the bug fixes so I am putting in the new code. I hope this is the last big pile of changes to the 1.9.16 series! (This used to be commit 20b6203dac4bbb43e4e7bea0b214496d76d679d9)
Diffstat (limited to 'source3/client')
-rw-r--r--source3/client/client.c16
-rw-r--r--source3/client/clitar.c2
2 files changed, 11 insertions, 7 deletions
diff --git a/source3/client/client.c b/source3/client/client.c
index cdf33a14b3..6db0f4694e 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -3787,10 +3787,12 @@ static BOOL list_servers(char *wk_grp)
for (i=0;i<count;i++) {
char *sname = p2;
+ uint32 stype = IVAL(p2,18);
int comment_offset = IVAL(p2,22) & 0xFFFF;
- printf("\t%-16.16s %s\n",
- sname,
- comment_offset?rdata+comment_offset-converter:"");
+ printf("\t%-16.16s %s (%8x)\n",
+ sname,
+ comment_offset?rdata+comment_offset-converter:"",
+ stype);
ok=True;
p2 += 26;
@@ -3826,10 +3828,12 @@ static BOOL list_servers(char *wk_grp)
for (i=0;i<count;i++) {
char *sname = p2;
+ uint32 stype = IVAL(p2,18);
int comment_offset = IVAL(p2,22) & 0xFFFF;
- printf("\t%-16.16s %s\n",
- sname,
- comment_offset?rdata+comment_offset-converter:"");
+ printf("\t%-16.16s %s (%8x)\n",
+ sname,
+ comment_offset?rdata+comment_offset-converter:"",
+ stype);
ok=True;
p2 += 26;
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index a4c1f00adf..13df5fef9a 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -374,7 +374,7 @@ static long unoct(char *p, int ndgs)
/****************************************************************************
Compare two strings in a slash insensitive way
***************************************************************************/
-int strslashcmp(const char *s1, const char *s2)
+int strslashcmp(char *s1,char *s2)
{
while(*s1 && *s2 &&
(*s1 == *s2