diff options
author | Jeremy Allison <jra@samba.org> | 2001-09-18 06:20:28 +0000 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2001-09-18 06:20:28 +0000 |
commit | b4b891279b6292237113456f1bb0d4393f1f9af1 (patch) | |
tree | 9d19c768d75f0ceb1f5452f1e7d8d3d887083064 | |
parent | e0bdcbc5994345fdc76f7590dba7bce5f0127d58 (diff) | |
download | samba-b4b891279b6292237113456f1bb0d4393f1f9af1.tar.gz samba-b4b891279b6292237113456f1bb0d4393f1f9af1.tar.xz samba-b4b891279b6292237113456f1bb0d4393f1f9af1.zip |
Use structure copy to fix unaligned accesses on 64bit architectures on
Linux.
Jeremy.
-rw-r--r-- | source/include/includes.h | 2 | ||||
-rw-r--r-- | source/locking/locking.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/include/includes.h b/source/include/includes.h index 8cb587209c8..9b56c8a4773 100644 --- a/source/include/includes.h +++ b/source/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/source/locking/locking.c b/source/locking/locking.c index 750ebe67166..a942965684e 100644 --- a/source/locking/locking.c +++ b/source/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; } /******************************************************************* |