[SCM] Samba Shared Repository - branch master updated - 1b42152454279d0df1a1e0aba0aac807abcea7ab

[Tim Prouty]

The branch, master has been updated
       via  1b42152454279d0df1a1e0aba0aac807abcea7ab (commit)
      from  0bfbae0f50df01ff058a23419173fd0553281fab (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1b42152454279d0df1a1e0aba0aac807abcea7ab
Author: Tim Prouty <[EMAIL PROTECTED]>
Date:   Thu Oct 23 13:41:44 2008 -0700

    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.

-----------------------------------------------------------------------

Summary of changes:
 librpc/idl/krb5pac.idl               |    2 +-
 source3/librpc/gen_ndr/krb5pac.h     |    2 +-
 source3/librpc/gen_ndr/ndr_krb5pac.c |    5 -----
 3 files changed, 2 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/idl/krb5pac.idl b/librpc/idl/krb5pac.idl
index a498b79..24c55b8 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 7ec3e95..73bd0d9 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 f9e93e5..125fb7e 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) {


-- 
Samba Shared Repository