r11103: Eliminate ascstr

(This used to be commit c8a0511f37f8cff3e949ffda0bb7fae714d5bbb4)

diff --git a/source4/librpc/idl/drsuapi.idl b/source4/librpc/idl/drsuapi.idl
index b348cbec571eaca9049c2b76962137f587a3a901..f900af9ce2a3457b885f6125847c6adc11a72f72 100644 (file)
--- a/source4/librpc/idl/drsuapi.idl
+++ b/source4/librpc/idl/drsuapi.idl
@@ -98,12 +98,12 @@ interface drsuapi
         * 
         * maybe the bind_guid could also be the invocation_id see drsuapi_DsReplicaConnection04
         */
-       const string DRSUAPI_DS_BIND_GUID = "e24d201a-4fd6-11d1-a3da-0000f875ae0d";
+       const char *DRSUAPI_DS_BIND_GUID = "e24d201a-4fd6-11d1-a3da-0000f875ae0d";
        /* 
         * this magic guid are needed to fetch the whole tree with drsuapi_DsGetNCChanges()
         */
-       const string DRSUAPI_DS_BIND_GUID_W2K   = "6abec3d1-3054-41c8-a362-5a0c5b7d5d71";
-       const string DRSUAPI_DS_BIND_GUID_W2K3  = "6afab99c-6e26-464a-975f-f58f105218bc";
+       const char *DRSUAPI_DS_BIND_GUID_W2K    = "6abec3d1-3054-41c8-a362-5a0c5b7d5d71";
+       const char *DRSUAPI_DS_BIND_GUID_W2K3   = "6afab99c-6e26-464a-975f-f58f105218bc";
 
        WERROR drsuapi_DsBind(
                [in,unique]         GUID *bind_guid,
@@ -714,7 +714,7 @@ interface drsuapi
 
        typedef struct {
                [ref] drsuapi_DsReplicaObjectIdentifier *naming_context;
-               [ref] ascstr *dest_dsa_dns_name;
+               [ref,charset(DOS),string] uint8 *dest_dsa_dns_name;
                GUID dest_dsa_guid;
                drsuapi_DsReplicaUpdateRefsOptions options;
        } drsuapi_DsReplicaUpdateRefsRequest1;

diff --git a/source4/librpc/idl/idl_types.h b/source4/librpc/idl/idl_types.h
index 872883df4b180612aa878923a5074cd0902aaf28..98a8d1c093e17540a01d244d93298effcf88fabc 100644 (file)
--- a/source4/librpc/idl/idl_types.h
+++ b/source4/librpc/idl/idl_types.h
@@ -32,12 +32,6 @@
 */
 #define astring15       [flag(STR_ASCII|STR_FIXLEN15)] string
 
-/*
-  an ascii string prefixed with [size] [offset] [length], all 32 bits
-  null terminated
-*/
-#define ascstr         [flag(STR_ASCII|STR_SIZE4|STR_LEN4)] string
-
 /*
   an ascii string prefixed with [offset] [length], both 32 bits
   null terminated

diff --git a/source4/librpc/idl/mgmt.idl b/source4/librpc/idl/mgmt.idl
index 8329c8e55fcfd5c2682c536297afe64395624492..ce9b50abfaf83744eab6239518d38e46d86ee2b6 100644 (file)
--- a/source4/librpc/idl/mgmt.idl
+++ b/source4/librpc/idl/mgmt.idl
@@ -71,6 +71,6 @@ interface mgmt
        WERROR mgmt_inq_princ_name (
                [in]        uint32                  authn_proto,
                [in]        uint32                  princ_name_size,
-               [out]       ascstr                  princ_name
+               [out]       [string,charset(DOS)] uint8 princ_name[]
                );
 }