diff options
author | Samba Release Account <samba-bugs@samba.org> | 1997-01-09 18:02:17 +0000 |
---|---|---|
committer | Samba Release Account <samba-bugs@samba.org> | 1997-01-09 18:02:17 +0000 |
commit | 8bc7d6bebd4fcf8c95cb6d58da14404a5e46de91 (patch) | |
tree | 177e5074c6a987134ff6f4019d6c482b92c70509 /source3/lib/util.c | |
parent | 43d414b4508ea46252aed52341d29dae007bb93b (diff) | |
download | samba-8bc7d6bebd4fcf8c95cb6d58da14404a5e46de91.tar.gz samba-8bc7d6bebd4fcf8c95cb6d58da14404a5e46de91.tar.bz2 samba-8bc7d6bebd4fcf8c95cb6d58da14404a5e46de91.zip |
Makefile: Changes to split Solaris into Solaris2.3 and previous, and 2.4 and after from Paul Eggert.
Makefile: Added AMIGA changes from Rask Ingemann Lambertsen <rask@k4315.kampsax.dtu.dk>.
charset.c: Patch for Western European Languages from Josef Hinteregger <joehtg@joehtg.co.at>
charset.h: Patch for Western European Languages from Josef Hinteregger <joehtg@joehtg.co.at>
clitar.c: Patch to re-sync after read fail from (lost contributor name, sorry).
includes.h: Patch for AMIGA from Rask Ingemann Lambertsen <rask@k4315.kampsax.dtu.dk>
includes.h: Patch for SunOS atexit by Jeremy (jra@cygnus.com)
interface.c: Patch for AMIGA from Rask Ingemann Lambertsen <rask@k4315.kampsax.dtu.dk>
kanji.h: Patch for Western European Languages from Josef Hinteregger <joehtg@joehtg.co.at>
locking.c: Patch to fix file locking from Jeremy (jra@cygnus.com)
locking.c: Patch to add granularity of lock files to usec by Jeremy (jra@cygnus.com)
pipes.c: Patch to fix file locking from Jeremy (jra@cygnus.com)
proto.h: Patch to fix file locking from Jeremy (jra@cygnus.com)
reply.c: Patch to fix file locking from Jeremy (jra@cygnus.com)
server.c: Patch to fix file locking from Jeremy (jra@cygnus.com)
server.c: Patch for FAST_SHARE_MODE fix from (lost contributor name, sorry).
smb.h: Patch to fix file locking from Jeremy (jra@cygnus.com)
smb.h: Patch to add granularity of lock files to usec by Jeremy (jra@cygnus.com)
status.c: Patch to fix file locking from Jeremy (jra@cygnus.com)
statuc.c: Patch to add granularity of lock files to usec by Jeremy (jra@cygnus.com)
system.c: Patch for Western European Languages from Josef Hinteregger <joehtg@joehtg.co.at>
trans2.c: Patch to fix file locking from Jeremy (jra@cygnus.com)
trans2.c: Patch to fix volume name reported to Win95 from Jeremy (jra@cygnus.com)
util.c: Patch for Western European Languages from Josef Hinteregger <joehtg@joehtg.co.at>
util.c: Patch to fix client_name from continuously returning UNKNOWN (from various contributors).
version.h: Update to 1.9.16p10.
(This used to be commit 03d28fa32eb094affa33133ebe2602fdb70f6361)
Diffstat (limited to 'source3/lib/util.c')
-rw-r--r-- | source3/lib/util.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c index 8730ae3143..318ac3fc61 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -957,9 +957,6 @@ void unix_format(char *fname) { pstring namecopy; string_replace(fname,'\\','/'); -#ifndef KANJI - dos2unix_format(fname, True); -#endif /* KANJI */ if (*fname == '/') { @@ -974,9 +971,6 @@ void unix_format(char *fname) ****************************************************************************/ void dos_format(char *fname) { -#ifndef KANJI - unix2dos_format(fname, True); -#endif /* KANJI */ string_replace(fname,'/','\\'); } @@ -3083,6 +3077,7 @@ char *client_name(void) if (getpeername(Client, &sa, &length) < 0) { DEBUG(0,("getpeername failed\n")); + done = False; return name_buf; } @@ -3092,6 +3087,7 @@ char *client_name(void) AF_INET)) == 0) { DEBUG(1,("Gethostbyaddr failed for %s\n",client_addr())); StrnCpy(name_buf,client_addr(),sizeof(name_buf) - 1); + done = False; } else { StrnCpy(name_buf,(char *)hp->h_name,sizeof(name_buf) - 1); if (!matchname(name_buf, sockin->sin_addr)) { @@ -3362,14 +3358,12 @@ char *readdirname(void *p) dname = ptr->d_name; -#ifdef KANJI { static pstring buf; strcpy(buf, dname); unix_to_dos(buf, True); dname = buf; } -#endif #ifdef NEXT2 if (telldir(p) < 0) return(NULL); |