diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-01-08 15:43:11 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-01-08 15:43:11 +0100 |
| commit | bfab6ab14bd2ba69fde8bbe32f56f308010c8ea7 (patch) | |
| tree | 4edbacab40c67bb5d9d6bebe66a22949349cbf9a /source3/libnet/libnet_join.h | |
| parent | 8dbeca6e9d06d573adebe8d9c5114b24d8782e43 (diff) | |
| parent | 62c91987d902d4dfe27023ff2ec2fb73e602105b (diff) | |
| download | samba-bfab6ab14bd2ba69fde8bbe32f56f308010c8ea7.tar.gz samba-bfab6ab14bd2ba69fde8bbe32f56f308010c8ea7.tar.bz2 samba-bfab6ab14bd2ba69fde8bbe32f56f308010c8ea7.zip | |
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit ea36c3add588061cf338deabb2d8952f2213a8bd)
Diffstat (limited to 'source3/libnet/libnet_join.h')
| -rw-r--r-- | source3/libnet/libnet_join.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source3/libnet/libnet_join.h b/source3/libnet/libnet_join.h index 9e7b8a9813..c6a0cd183c 100644 --- a/source3/libnet/libnet_join.h +++ b/source3/libnet/libnet_join.h @@ -31,9 +31,11 @@ struct libnet_JoinCtx { const char *machine_password; uint32_t join_flags; const char *os_version; - const char *os_string; + const char *os_name; + bool create_upn; const char *upn; bool modify_config; + struct ads_struct *ads; } in; struct { @@ -44,23 +46,27 @@ struct libnet_JoinCtx { struct dom_sid *domain_sid; bool modified_config; WERROR result; + char *error_string; } out; }; struct libnet_UnjoinCtx { struct { const char *dc_name; + const char *machine_name; const char *domain_name; const char *admin_account; const char *admin_password; uint32_t unjoin_flags; bool modify_config; struct dom_sid *domain_sid; + struct ads_struct *ads; } in; struct { bool modified_config; WERROR result; + char *error_string; } out; }; |