r11099: Replace unistr with [string] equivalent

(This used to be commit 6a8291c80ee814a6bdc092b3ef53f450f30b44a0)

diff --git a/source4/librpc/idl/dcom.idl b/source4/librpc/idl/dcom.idl
index 5e881326c57e4d33fc4e5046ab74840b3cb1687c..dc92aa602f1de420755412dec5d010cd28b3694e 100644 (file)
--- a/source4/librpc/idl/dcom.idl
+++ b/source4/librpc/idl/dcom.idl
@@ -268,7 +268,7 @@ interface IRemUnknown2 : IRemUnknown
        object
 ] interface ICoffeeMachine : IUnknown
 {
-       [helpstring("method MakeCoffee")] WERROR MakeCoffee([in] unistr *flavor);
+       WERROR MakeCoffee([in,string,charset(UTF16)] uint16 *flavor);
 }
 
 [

diff --git a/source4/librpc/idl/drsuapi.idl b/source4/librpc/idl/drsuapi.idl
index 075b97ce9caec9444206e894e409352033c44372..b348cbec571eaca9049c2b76962137f587a3a901 100644 (file)
--- a/source4/librpc/idl/drsuapi.idl
+++ b/source4/librpc/idl/drsuapi.idl
@@ -810,7 +810,7 @@ interface drsuapi
        } drsuapi_DsNameFormat;
 
        typedef struct {
-               unistr *str;
+               [string,charset(UTF16)] uint16 *str;
        } drsuapi_DsNameString;
 
        typedef struct {
@@ -829,8 +829,8 @@ interface drsuapi
 
        typedef struct {
                drsuapi_DsNameStatus status;
-               unistr *dns_domain_name;
-               unistr *result_name;
+               [charset(UTF16),string] uint16 *dns_domain_name;
+               [charset(UTF16),string] uint16 *result_name;
        } drsuapi_DsNameInfo1;
 
        typedef struct {
@@ -860,7 +860,7 @@ interface drsuapi
        typedef struct {
                drsuapi_DsSpnOperation operation;
                uint32 unknown1;
-               unistr *object_dn;
+               [charset(UTF16),string] uint16 *object_dn;
                [range(0,10000)] uint32 count;
                [size_is(count)] drsuapi_DsNameString *spn_names;
        } drsuapi_DsWriteAccountSpnRequest1;
@@ -895,7 +895,7 @@ interface drsuapi
        /*****************/
         /* Function 0x10 */
        typedef struct {
-               unistr *domain_name; /* netbios or dns */
+               [charset(UTF16),string] uint16 *domain_name; /* netbios or dns */
                int32 level; /* specifies the switch level for the request */
        } drsuapi_DsGetDCInfoRequest1;
 
@@ -904,11 +904,11 @@ interface drsuapi
        } drsuapi_DsGetDCInfoRequest;
 
        typedef struct {
-               unistr *netbios_name;
-               unistr *dns_name;
-               unistr *site_name;
-               unistr *computer_dn;
-               unistr *server_dn;
+               [charset(UTF16),string] uint16 *netbios_name;
+               [charset(UTF16),string] uint16 *dns_name;
+               [charset(UTF16),string] uint16 *site_name;
+               [charset(UTF16),string] uint16 *computer_dn;
+               [charset(UTF16),string] uint16 *server_dn;
                uint32 is_pdc;
                uint32 is_enabled;
        } drsuapi_DsGetDCInfo1;
@@ -919,13 +919,13 @@ interface drsuapi
        } drsuapi_DsGetDCInfoCtr1;
 
        typedef struct {
-               unistr *netbios_name;
-               unistr *dns_name;
-               unistr *site_name;
-               unistr *site_dn;
-               unistr *computer_dn;
-               unistr *server_dn;
-               unistr *ntds_dn;
+               [charset(UTF16),string] uint16 *netbios_name;
+               [charset(UTF16),string] uint16 *dns_name;
+               [charset(UTF16),string] uint16 *site_name;
+               [charset(UTF16),string] uint16 *site_dn;
+               [charset(UTF16),string] uint16 *computer_dn;
+               [charset(UTF16),string] uint16 *server_dn;
+               [charset(UTF16),string] uint16 *ntds_dn;
                uint32 is_pdc;
                uint32 is_enabled;
                uint32 is_gc;
@@ -947,7 +947,7 @@ interface drsuapi
                uint32 unknown4;
                uint32 unknown5;
                uint32 unknown6;
-               unistr *server_nt4_account;
+               [charset(UTF16),string] uint16 *server_nt4_account;
        } drsuapi_DsGetDCInfo01;
 
        typedef struct {
@@ -1111,17 +1111,17 @@ interface drsuapi
 
        typedef struct {
                drsuapi_DsReplicaInfoType info_type;
-               unistr *object_dn;
+               [charset(UTF16),string] uint16 *object_dn;
                GUID guid1;
        } drsuapi_DsReplicaGetInfoRequest1;
 
        typedef struct {
                drsuapi_DsReplicaInfoType info_type;
-               unistr *object_dn;
+               [charset(UTF16),string] uint16 *object_dn;
                GUID guid1;
                uint32 unknown1;
-               unistr *string1;
-               unistr *string2;
+               [charset(UTF16),string] uint16 *string1;
+               [charset(UTF16),string] uint16 *string2;
                uint32 unknown2;
        } drsuapi_DsReplicaGetInfoRequest2;
 
@@ -1131,10 +1131,10 @@ interface drsuapi
        } drsuapi_DsReplicaGetInfoRequest;
 
        typedef struct {
-               unistr *naming_context_dn;
-               unistr *source_dsa_obj_dn;
-               unistr *source_dsa_address;
-               unistr *transport_obj_dn;
+               [charset(UTF16),string] uint16 *naming_context_dn;
+               [charset(UTF16),string] uint16 *source_dsa_obj_dn;
+               [charset(UTF16),string] uint16 *source_dsa_address;
+               [charset(UTF16),string] uint16 *transport_obj_dn;
                drsuapi_DsReplicaNeighbourFlags replica_flags;
                uint32 reserved;
                GUID naming_context_obj_guid;
@@ -1162,7 +1162,7 @@ interface drsuapi
        } drsuapi_DsReplicaCoursorCtr;
 
        typedef struct {
-               unistr *attribute_name;
+               [charset(UTF16),string] uint16 *attribute_name;
                uint32 version;
                NTTIME originating_last_changed;
                GUID originating_dsa_invocation_id;
@@ -1177,7 +1177,7 @@ interface drsuapi
        } drsuapi_DsReplicaObjMetaDataCtr;
 
        typedef struct {
-               unistr *dsa_obj_dn;
+               [charset(UTF16),string] uint16 *dsa_obj_dn;
                GUID dsa_obj_guid;
                NTTIME first_failure;
                uint32 num_failures;
@@ -1213,9 +1213,9 @@ interface drsuapi
                uint32 priority;
                drsuapi_DsReplicaOpType operation_type;
                [switch_is(operation_type)] drsuapi_DsRplicaOpOptions options;
-               unistr *nc_dn;
-               unistr *remote_dsa_obj_dn;
-               unistr *remote_dsa_address;
+               [charset(UTF16),string] uint16 *nc_dn;
+               [charset(UTF16),string] uint16 *remote_dsa_obj_dn;
+               [charset(UTF16),string] uint16 *remote_dsa_address;
                GUID nc_obj_guid;
                GUID remote_dsa_obj_guid;
        } drsuapi_DsReplicaOp;
@@ -1227,8 +1227,8 @@ interface drsuapi
        } drsuapi_DsReplicaOpCtr;
 
        typedef struct {
-               unistr *attribute_name;
-               unistr *object_dn;
+               [charset(UTF16),string] uint16 *attribute_name;
+               [charset(UTF16),string] uint16 *object_dn;
                uint32 value_length;
                [size_is(value_length)] uint8 *value;
                NTTIME deleted;
@@ -1256,7 +1256,7 @@ interface drsuapi
                GUID source_dsa_invocation_id;
                hyper highest_usn;
                NTTIME last_sync_success;
-               unistr *source_dsa_obj_dn;
+               [charset(UTF16),string] uint16 *source_dsa_obj_dn;
        } drsuapi_DsReplicaCoursor3;
 
        typedef struct {
@@ -1266,13 +1266,13 @@ interface drsuapi
        } drsuapi_DsReplicaCoursor3Ctr;
 
        typedef struct {
-               unistr *attribute_name;
+               [charset(UTF16),string] uint16 *attribute_name;
                uint32 version;
                NTTIME originating_last_changed;
                GUID originating_dsa_invocation_id;
                hyper originating_usn;
                hyper local_usn;
-               unistr *originating_dsa_obj_dn;
+               [charset(UTF16),string] uint16 *originating_dsa_obj_dn;
        } drsuapi_DsReplicaObjMetaData2;
 
        typedef struct {
@@ -1282,8 +1282,8 @@ interface drsuapi
        } drsuapi_DsReplicaObjMetaData2Ctr;
 
        typedef struct {
-               unistr *attribute_name;
-               unistr *object_dn;
+               [charset(UTF16),string] uint16 *attribute_name;
+               [charset(UTF16),string] uint16 *object_dn;
                uint32 value_length;
                [size_is(value_length)] uint8 *value;
                NTTIME deleted;
@@ -1293,7 +1293,7 @@ interface drsuapi
                GUID originating_dsa_invocation_id;
                hyper originating_usn;
                hyper local_usn;
-               unistr *originating_dsa_obj_dn;
+               [charset(UTF16),string] uint16 *originating_dsa_obj_dn;
        } drsuapi_DsReplicaAttrValMetaData2;
 
        typedef struct {
@@ -1319,7 +1319,7 @@ interface drsuapi
        } drsuapi_DsReplicaConnection04Ctr;
 
        typedef struct {
-               unistr *str1;
+               [charset(UTF16),string] uint16 *str1;
                uint32 u1;
                uint32 u2;
                uint32 u3;

diff --git a/source4/librpc/idl/dssetup.idl b/source4/librpc/idl/dssetup.idl
index 3ae9986fde317bdad340d43ac4708adfe427a15a..818460fbba3b5b5d65d9ccbcb165537d5bcec311 100644 (file)
--- a/source4/librpc/idl/dssetup.idl
+++ b/source4/librpc/idl/dssetup.idl
@@ -34,9 +34,9 @@
        typedef struct {
                dssetup_DsRole          role;
                dssetup_DsRoleFlags     flags;
-               unistr                  *domain;
-               unistr                  *dns_domain;
-               unistr                  *forest;
+               [charset(UTF16),string] uint16                  *domain;
+               [charset(UTF16),string] uint16                  *dns_domain;
+               [charset(UTF16),string] uint16                  *forest;
                GUID                    domain_guid;
        } dssetup_DsRolePrimaryDomInfoBasic;
 

diff --git a/source4/librpc/idl/efs.idl b/source4/librpc/idl/efs.idl
index 310e3522b182e053b822ea00fa5ed651f4a03226..c58b72a401e303e4ece22c28cfec9595ed5c3ecd 100644 (file)
--- a/source4/librpc/idl/efs.idl
+++ b/source4/librpc/idl/efs.idl
@@ -14,7 +14,7 @@
 
 WERROR EfsRpcOpenFileRaw(
        [out,ref] policy_handle *pvContext,
-       [in] unistr FileName,
+       [in] [charset(UTF16),string] uint16 FileName[],
        [in] uint32 Flags
        );
 
@@ -34,11 +34,11 @@ void EfsRpcCloseRaw(
 );
 
 WERROR EfsRpcEncryptFileSrv(
-       [in] unistr Filename
+       [in] [charset(UTF16),string] uint16 Filename[]
 );
 
 WERROR EfsRpcDecryptFileSrv(
-       [in] unistr FileName, 
+       [in] [charset(UTF16),string] uint16 FileName[], 
        [in] uint32 Reserved
 );
 
@@ -51,7 +51,7 @@ typedef struct {
        uint32 cbTotalLength;
        [unique] dom_sid *pUserSid;
        [unique] EFS_HASH_BLOB  *pHash;
-       [unique] unistr *lpDisplayInformation;
+       [unique] [charset(UTF16),string] uint16 *lpDisplayInformation;
 } ENCRYPTION_CERTIFICATE_HASH;
 
 typedef struct {
@@ -61,22 +61,22 @@ typedef struct {
 } ENCRYPTION_CERTIFICATE_HASH_LIST;
 
 WERROR EfsRpcQueryUsersOnFile(
-       [in] unistr FileName,
+       [in] [charset(UTF16),string] uint16 FileName[],
        [out,ref,unique] ENCRYPTION_CERTIFICATE_HASH_LIST **pUsers
 );
 
 WERROR EfsRpcQueryRecoveryAgents(
-       [in] unistr FileName,
+       [in] [charset(UTF16),string] uint16 FileName[],
        [out,ref,unique] ENCRYPTION_CERTIFICATE_HASH_LIST **pRecoveryAgents
 );
 
 WERROR EfsRpcRemoveUsersFromFile(
-       [in] unistr FileName
+       [in] [charset(UTF16),string] uint16 FileName[]
        /*      [in] ENCRYPTION_CERTIFICATE_LIST Hashes*/
 );
 
 WERROR EfsRpcAddUsersToFile(
-       [in] unistr FileName
+       [in] [charset(UTF16),string] uint16 FileName[]
        /*      [in] ENCRYPTION_CERTIFICATE_LIST Hashes*/
 );
 

diff --git a/source4/librpc/idl/samr.idl b/source4/librpc/idl/samr.idl
index 3ca7d1bd0639a0361a76920d2d470bc2616ce9e9..1555dadfeb6e38322f909e9804403946509049b4 100644 (file)
--- a/source4/librpc/idl/samr.idl
+++ b/source4/librpc/idl/samr.idl
@@ -1084,7 +1084,7 @@
        /************************/
        /* Function    0x39     */
        NTSTATUS samr_Connect2(
-               [in] unistr *system_name,
+               [in,string,charset(UTF16)] uint16 *system_name,
                [in] uint32 access_mask,
                [out,ref]  policy_handle *connect_handle
                );
@@ -1122,7 +1122,7 @@
        /************************/
        /* Function    0x3d     */
        NTSTATUS samr_Connect3(
-               [in] unistr *system_name,
+               [in,string,charset(UTF16)] uint16 *system_name,
                /* this unknown value seems to be completely ignored by w2k3 */
                [in] uint32 unknown,
                [in] uint32 access_mask,
@@ -1132,7 +1132,7 @@
        /************************/
        /* Function    0x3e     */
        NTSTATUS samr_Connect4(
-               [in] unistr *system_name,
+               [in,string,charset(UTF16)] uint16 *system_name,
                [in] uint32 unknown,
                [in] uint32 access_mask,
                [out,ref]  policy_handle *connect_handle
@@ -1179,7 +1179,7 @@
        } samr_ConnectInfo;
 
        NTSTATUS samr_Connect5(
-               [in]       unistr             *system_name,
+               [in,string,charset(UTF16)] uint16 *system_name,
                [in]       uint32             access_mask,
                [in,out]   uint32             level,
                [in,out,switch_is(level),ref] samr_ConnectInfo *info,

diff --git a/source4/script/tests/selftest.sh b/source4/script/tests/selftest.sh
index f402b0ffd0e54b94b5d83e3185cd5f45048da9e9..4066ebaac20e13bf12a50746a8f8116ae077b78f 100755 (executable)
--- a/source4/script/tests/selftest.sh
+++ b/source4/script/tests/selftest.sh
@@ -135,10 +135,14 @@ EOF
 
 export KRB5_CONFIG
 
+echo -n "PROVISIONING..."
+
 ./setup/provision $CONFIGURATION --host-name=$SERVER --host-ip=127.0.0.1 \
     --quiet --domain $DOMAIN --realm $REALM \
     --adminpass $PASSWORD --root=$ROOT || exit 1
 
+echo "DONE"
+
 if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
        CONFIGURATION="$CONFIGURATION --option=\"torture:progress=no\""
 fi