run make idl after idl change "Handle arbitrary new PAC types"
authorMichael Adam <obnox@samba.org>
Tue, 26 Aug 2008 14:09:50 +0000 (16:09 +0200)
committerMichael Adam <obnox@samba.org>
Tue, 26 Aug 2008 14:09:50 +0000 (16:09 +0200)
Michael
(This used to be commit 5de253ba1308f470a47f9e5f83c6eccd17e95c26)

source3/librpc/gen_ndr/krb5pac.h
source3/librpc/gen_ndr/ndr_krb5pac.c

index 2d799ea7c750f8f040f98d48e2178cc8b97f5b7a..b3b29e5b2fd2a7424b37dfcb269b1c1aa674c840 100644 (file)
@@ -76,7 +76,7 @@ union PAC_INFO {
        struct PAC_SIGNATURE_DATA srv_cksum;/* [case(PAC_TYPE_SRV_CHECKSUM)] */
        struct PAC_SIGNATURE_DATA kdc_cksum;/* [case(PAC_TYPE_KDC_CHECKSUM)] */
        struct PAC_LOGON_NAME logon_name;/* [case(PAC_TYPE_LOGON_NAME)] */
-       struct DATA_BLOB_REM unknown;/* [subcontext(0),case(PAC_TYPE_UNKNOWN_12)] */
+       struct DATA_BLOB_REM unknown;/* [subcontext(0),default] */
 }/* [gensize,nodiscriminant,public] */;
 
 struct PAC_BUFFER {
index 70d63aee91d0d3226b9a9210bd9db198f5f17df2..6e06f90a688f05865889ad740ac5145c00182fff 100644 (file)
@@ -319,7 +319,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_PAC_INFO(struct ndr_push *ndr, int ndr_flags
                                NDR_CHECK(ndr_push_PAC_LOGON_NAME(ndr, NDR_SCALARS, &r->logon_name));
                        break; }
 
-                       case PAC_TYPE_UNKNOWN_12: {
+                       default: {
                                {
                                        struct ndr_push *_ndr_unknown;
                                        NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_unknown, 0, -1));
@@ -328,8 +328,6 @@ _PUBLIC_ enum ndr_err_code ndr_push_PAC_INFO(struct ndr_push *ndr, int ndr_flags
                                }
                        break; }
 
-                       default:
-                               return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
                }
        }
        if (ndr_flags & NDR_BUFFERS) {
@@ -348,11 +346,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_PAC_INFO(struct ndr_push *ndr, int ndr_flags
                        case PAC_TYPE_LOGON_NAME:
                        break;
 
-                       case PAC_TYPE_UNKNOWN_12:
+                       default:
                        break;
 
-                       default:
-                               return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
                }
        }
        return NDR_ERR_SUCCESS;
@@ -380,7 +376,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_PAC_INFO(struct ndr_pull *ndr, int ndr_flags
                                NDR_CHECK(ndr_pull_PAC_LOGON_NAME(ndr, NDR_SCALARS, &r->logon_name));
                        break; }
 
-                       case PAC_TYPE_UNKNOWN_12: {
+                       default: {
                                {
                                        struct ndr_pull *_ndr_unknown;
                                        NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_unknown, 0, -1));
@@ -389,8 +385,6 @@ _PUBLIC_ enum ndr_err_code ndr_pull_PAC_INFO(struct ndr_pull *ndr, int ndr_flags
                                }
                        break; }
 
-                       default:
-                               return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
                }
        }
        if (ndr_flags & NDR_BUFFERS) {
@@ -408,11 +402,9 @@ _PUBLIC_ enum ndr_err_code ndr_pull_PAC_INFO(struct ndr_pull *ndr, int ndr_flags
                        case PAC_TYPE_LOGON_NAME:
                        break;
 
-                       case PAC_TYPE_UNKNOWN_12:
+                       default:
                        break;
 
-                       default:
-                               return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
                }
        }
        return NDR_ERR_SUCCESS;
@@ -440,12 +432,10 @@ _PUBLIC_ void ndr_print_PAC_INFO(struct ndr_print *ndr, const char *name, const
                        ndr_print_PAC_LOGON_NAME(ndr, "logon_name", &r->logon_name);
                break;
 
-               case PAC_TYPE_UNKNOWN_12:
+               default:
                        ndr_print_DATA_BLOB_REM(ndr, "unknown", &r->unknown);
                break;
 
-               default:
-                       ndr_print_bad_level(ndr, name, level);
        }
 }