summaryrefslogtreecommitdiff
path: root/source/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
commit20b6203dac4bbb43e4e7bea0b214496d76d679d9 (patch)
tree173087b470d3f84f26cc57d5b6e067fda3152d4c /source/client
parentb6c1c60d72e1625ca172b8f8eb07078413611468 (diff)
downloadsamba-20b6203dac4bbb43e4e7bea0b214496d76d679d9.tar.gz
- 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!
Diffstat (limited to 'source/client')
-rw-r--r--source/client/client.c16
-rw-r--r--source/client/clitar.c2
2 files changed, 11 insertions, 7 deletions
diff --git a/source/client/client.c b/source/client/client.c
index cdf33a14b3d..6db0f4694ec 100644
--- a/source/client/client.c
+++ b/source/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/source/client/clitar.c b/source/client/clitar.c
index a4c1f00adf3..13df5fef9ad 100644
--- a/source/client/clitar.c
+++ b/source/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