diff options
| author | Tim Prouty <tprouty@samba.org> | 2008-10-23 13:41:44 -0700 |
|---|---|---|
| committer | Tim Prouty <tprouty@samba.org> | 2008-10-23 15:13:54 -0700 |
| commit | 1b42152454279d0df1a1e0aba0aac807abcea7ab (patch) | |
| tree | 85e6b4cf6213cf0138a64e18231369c75c7b23c9 | |
| parent | 0bfbae0f50df01ff058a23419173fd0553281fab (diff) | |
| download | samba-1b42152454279d0df1a1e0aba0aac807abcea7ab.tar.gz samba-1b42152454279d0df1a1e0aba0aac807abcea7ab.tar.bz2 samba-1b42152454279d0df1a1e0aba0aac807abcea7ab.zip | |
Fix "ndr_size_PAC_LOGON_INFO defined but not used" build warning
This patch removes the gensize option from krb5pac.idl because it
generates an unused function that has been causing warnings during the
s3 build. I re-ran 'make samba3-idl' to update the generated files
for s3. For s4 I ran a full build with no problems.
| -rw-r--r-- | librpc/idl/krb5pac.idl | 2 | ||||
| -rw-r--r-- | source3/librpc/gen_ndr/krb5pac.h | 2 | ||||
| -rw-r--r-- | source3/librpc/gen_ndr/ndr_krb5pac.c | 5 |
3 files changed, 2 insertions, 7 deletions
diff --git a/librpc/idl/krb5pac.idl b/librpc/idl/krb5pac.idl index a498b795f8..24c55b8541 100644 --- a/librpc/idl/krb5pac.idl +++ b/librpc/idl/krb5pac.idl @@ -25,7 +25,7 @@ interface krb5pac [flag(NDR_REMAINING)] DATA_BLOB signature; } PAC_SIGNATURE_DATA; - typedef [gensize] struct { + typedef struct { netr_SamInfo3 info3; dom_sid2 *res_group_dom_sid; samr_RidWithAttributeArray res_groups; diff --git a/source3/librpc/gen_ndr/krb5pac.h b/source3/librpc/gen_ndr/krb5pac.h index 7ec3e95d70..73bd0d95bb 100644 --- a/source3/librpc/gen_ndr/krb5pac.h +++ b/source3/librpc/gen_ndr/krb5pac.h @@ -24,7 +24,7 @@ struct PAC_LOGON_INFO { struct netr_SamInfo3 info3; struct dom_sid2 *res_group_dom_sid;/* [unique] */ struct samr_RidWithAttributeArray res_groups; -}/* [gensize] */; +}; struct PAC_UNKNOWN_12 { uint16_t upn_size;/* [value(2*strlen_m(upn_name))] */ diff --git a/source3/librpc/gen_ndr/ndr_krb5pac.c b/source3/librpc/gen_ndr/ndr_krb5pac.c index f9e93e5210..125fb7eb77 100644 --- a/source3/librpc/gen_ndr/ndr_krb5pac.c +++ b/source3/librpc/gen_ndr/ndr_krb5pac.c @@ -161,11 +161,6 @@ _PUBLIC_ void ndr_print_PAC_LOGON_INFO(struct ndr_print *ndr, const char *name, ndr->depth--; } -static size_t ndr_size_PAC_LOGON_INFO(const struct PAC_LOGON_INFO *r, int flags) -{ - return ndr_size_struct(r, flags, (ndr_push_flags_fn_t)ndr_push_PAC_LOGON_INFO); -} - _PUBLIC_ enum ndr_err_code ndr_push_PAC_LOGON_INFO_CTR(struct ndr_push *ndr, int ndr_flags, const struct PAC_LOGON_INFO_CTR *r) { if (ndr_flags & NDR_SCALARS) { |