summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/lib/debug.c3
-rw-r--r--source3/smbd/notify_hash.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/source3/lib/debug.c b/source3/lib/debug.c
index 6524d58ecb..92b80c8736 100644
--- a/source3/lib/debug.c
+++ b/source3/lib/debug.c
@@ -365,7 +365,8 @@ BOOL reopen_logs( void )
log_overflow = True;
DEBUG(0, ("Unable to open new log file %s: %s\n", debugf, strerror(errno)));
log_overflow = False;
- x_fflush(dbf);
+ if (dbf)
+ x_fflush(dbf);
ret = False;
} else {
x_setbuf(new_dbf, NULL);
diff --git a/source3/smbd/notify_hash.c b/source3/smbd/notify_hash.c
index a8470102d5..178dcecc82 100644
--- a/source3/smbd/notify_hash.c
+++ b/source3/smbd/notify_hash.c
@@ -116,7 +116,7 @@ static BOOL notify_hash(connection_struct *conn, char *path, uint32 flags,
if (flags & (FILE_NOTIFY_CHANGE_DIR_NAME|FILE_NOTIFY_CHANGE_FILE_NAME|FILE_NOTIFY_CHANGE_FILE)) {
int i;
unsigned char tmp_hash[16];
- mdfour(tmp_hash, (const unsigned char *)fname, strlen(fname));
+ mdfour(tmp_hash, (unsigned char *)fname, strlen(fname));
for (i=0;i<16;i++)
data->name_hash[i] ^= tmp_hash[i];
}
@@ -195,7 +195,7 @@ static BOOL hash_check_notify(connection_struct *conn, uint16 vuid, char *path,
static void hash_remove_notify(void *datap)
{
- SAFE_FREE(datap);
+ free(datap);
}
/****************************************************************************