diff options
| author | Karolin Seeger <kseeger@samba.org> | 2008-02-29 10:44:38 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-02-29 10:44:38 +0100 |
| commit | c4fbe2846231a6b322c1094c6a1dbf93b7305768 (patch) | |
| tree | 09eb77a294f4acda131b41fe4c9bec4ed175eb16 /source3/librpc/gen_ndr/wkssvc.h | |
| parent | 1a6415fc77c708b87c8e2ce6e7828f486ffc87ac (diff) | |
| parent | 695b6662abe64a40061bfa05ede12173fc4b1945 (diff) | |
| download | samba-c4fbe2846231a6b322c1094c6a1dbf93b7305768.tar.gz samba-c4fbe2846231a6b322c1094c6a1dbf93b7305768.tar.bz2 samba-c4fbe2846231a6b322c1094c6a1dbf93b7305768.zip | |
Merge commit 'origin/v3-2-test' into v3-2-stable
Conflicts:
WHATSNEW.txt
(This used to be commit a390bcf9403df4cf4d5eef42b35ebccbe253882e)
Diffstat (limited to 'source3/librpc/gen_ndr/wkssvc.h')
| -rw-r--r-- | source3/librpc/gen_ndr/wkssvc.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source3/librpc/gen_ndr/wkssvc.h b/source3/librpc/gen_ndr/wkssvc.h index b4df7c2d8f..088ad6632b 100644 --- a/source3/librpc/gen_ndr/wkssvc.h +++ b/source3/librpc/gen_ndr/wkssvc.h @@ -415,8 +415,6 @@ struct wkssvc_NetrWorkstationStatistics { /* bitmap wkssvc_renameflags */ #define WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE ( 0x00000002 ) -; - enum wkssvc_NetValidateNameType #ifndef USE_UINT_ENUMS { @@ -471,8 +469,6 @@ struct wkssvc_PasswordBuffer { #define WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE ( 0x00000002 ) #define WKSSVC_JOIN_FLAGS_JOIN_TYPE ( 0x00000001 ) -; - enum wkssvc_ComputerNameType #ifndef USE_UINT_ENUMS { @@ -830,7 +826,7 @@ struct wkssvc_NetrGetJoinableOus { } in; struct { - const char ***ous;/* [ref,charset(UTF16),size_is(*num_ous)] */ + const char ***ous;/* [ref,charset(UTF16),size_is(,*num_ous)] */ uint32_t *num_ous;/* [ref] */ WERROR result; } out; @@ -912,7 +908,7 @@ struct wkssvc_NetrGetJoinableOus2 { } in; struct { - const char ***ous;/* [ref,charset(UTF16),size_is(*num_ous)] */ + const char ***ous;/* [ref,charset(UTF16),size_is(,*num_ous)] */ uint32_t *num_ous;/* [ref] */ WERROR result; } out; |