diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-05-07 08:12:16 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-05-07 08:12:16 +1000 |
| commit | f446bf59e300a53f4564bcf99d8614b440905147 (patch) | |
| tree | 5320c28305a9f919e4f36faf8d991812d18a3287 | |
| parent | 410115bb6b8e9674c9779fc9bc5d1cb7022bebcf (diff) | |
| parent | 42059c7e7665833e0116dc4e1e9aa948726ec816 (diff) | |
| download | samba-f446bf59e300a53f4564bcf99d8614b440905147.tar.gz samba-f446bf59e300a53f4564bcf99d8614b440905147.tar.bz2 samba-f446bf59e300a53f4564bcf99d8614b440905147.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit c21dd40bc73acafe6bd28cfd0de60f2a4b03853a)
| -rw-r--r-- | source4/lib/replace/system/config.m4 | 1 | ||||
| -rw-r--r-- | source4/torture/rpc/samba3rpc.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source4/lib/replace/system/config.m4 b/source4/lib/replace/system/config.m4 index 66c2bd652a..ae26bb5590 100644 --- a/source4/lib/replace/system/config.m4 +++ b/source4/lib/replace/system/config.m4 @@ -9,6 +9,7 @@ AC_CHECK_HEADERS(sys/select.h) # time AC_CHECK_HEADERS(sys/time.h utime.h) AC_HEADER_TIME +AC_CHECK_FUNCS(utime utimes futimes) # wait AC_HEADER_SYS_WAIT diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c index 1103acaefa..17342f9b86 100644 --- a/source4/torture/rpc/samba3rpc.c +++ b/source4/torture/rpc/samba3rpc.c @@ -426,7 +426,7 @@ static NTSTATUS get_usr_handle(struct smbcli_state *cli, "builtin") ? 1:0; l.in.connect_handle = &conn_handle; - domain_name.string = enumdom.out.sam->entries[0].name.string; + domain_name.string = enumdom.out.sam->entries[dom_idx].name.string; *domain = talloc_strdup(mem_ctx, domain_name.string); l.in.domain_name = &domain_name; |