diff options
| -rw-r--r-- | source3/client/clitar.c | 9 | ||||
| -rw-r--r-- | source3/passdb/passdb.c | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/source3/client/clitar.c b/source3/client/clitar.c index 412af8fa83..b06b5b2d37 100644 --- a/source3/client/clitar.c +++ b/source3/client/clitar.c @@ -307,7 +307,7 @@ static long readtarheader(union hblock *hb, file_info2 *finfo, char *prefix) } fprintf(stdout, "\n"); fprintf(stdout, "%s\n", hb -> dummy); - fprintf(stdout, "Tarbuf = %X, hb = %X\n", tarbuf, hb); + fprintf(stdout, "Tarbuf = %X, hb = %X\n", (int)tarbuf, (int)hb); return -1; } @@ -2309,7 +2309,6 @@ static int read_inclusion_file(char *filename) char *p; char *tmpstr; int i; - int result = 0; int error = 0; clipn = 0; @@ -2388,10 +2387,10 @@ static int read_inclusion_file(char *filename) } if (error) { if (cliplist) { - char **p; + char **pp; /* We know cliplist is always null-terminated */ - for (p = cliplist; *p; ++p) { - free(*p); + for (pp = cliplist; *pp; ++pp) { + free(*pp); } free(cliplist); cliplist = NULL; diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c index 2ba856e19b..cc4a8e5c55 100644 --- a/source3/passdb/passdb.c +++ b/source3/passdb/passdb.c @@ -874,6 +874,8 @@ static BOOL read_sid_from_file(int fd, char *sid_file) { fstring fline; + memset(fline, '\0', sizeof(fline)); + if(read(fd, fline, sizeof(fline) -1 ) < 0) { DEBUG(0,("read_sid_from_file: unable to read file %s. Error was %s\n", sid_file, strerror(errno) )); |