diff options
| -rw-r--r-- | source3/include/includes.h | 2 | ||||
| -rw-r--r-- | source3/locking/locking.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 8cb587209c..9b56c8a477 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -753,7 +753,7 @@ typedef struct smb_wpasswd { #define MAP_FILE 0 #endif -#if (!defined(WITH_NISPLUS) && !defined(WITH_LDAP) && !defined(WITH_TDBPWD)) +#if (!defined(WITH_NISPLUS) && !defined(WITH_LDAP) && !defined(WITH_TDBSAM)) #define USE_SMBPASS_DB 1 #endif diff --git a/source3/locking/locking.c b/source3/locking/locking.c index 750ebe6716..a942965684 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -456,7 +456,7 @@ static void fill_share_mode(char *p, files_struct *fsp, uint16 port, uint16 op_t e->share_mode = fsp->share_mode; e->op_port = port; e->op_type = op_type; - memcpy((char *)&e->time, (char *)&fsp->open_time, sizeof(struct timeval)); + e->time = fsp->open_time; } /******************************************************************* |