Remove C++ comments.

(This used to be commit 180374c4440765f3d08e5690967beb387ae3b54d)

diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h
index 8ffec5b8bce721f64417e80076ad64d1f8adc36f..78d5c244a6f99dd76b0f69685da5636b01c41503 100644 (file)
--- a/source3/include/rpc_samr.h
+++ b/source3/include/rpc_samr.h
@@ -145,7 +145,8 @@ SamrTestPrivateFunctionsUser
 #define SAMR_CONNECT           0x39
 #define SAMR_SET_USERINFO      0x3A
 
-//Access bits to the SAM-object
+/* Access bits to the SAM-object */
+
 #define SAMR_ACCESS_UNKNOWN_1        0x00000001
 #define SAMR_ACCESS_SHUTDOWN_SERVER  0x00000002
 #define SAMR_ACCESS_UNKNOWN_4        0x00000004
@@ -173,7 +174,8 @@ SamrTestPrivateFunctionsUser
                            SAMR_ACCESS_OPEN_DOMAIN         | \
                           SAMR_ACCESS_UNKNOWN_1 )            
 
-//Access bits to Domain-objects
+/* Access bits to Domain-objects */
+
 #define DOMAIN_ACCESS_LOOKUP_INFO_1  0x000000001
 #define DOMAIN_ACCESS_SET_INFO_1     0x000000002
 #define DOMAIN_ACCESS_LOOKUP_INFO_2  0x000000004
@@ -216,7 +218,8 @@ SamrTestPrivateFunctionsUser
                             DOMAIN_ACCESS_ENUM_ACCOUNTS     | \
                             DOMAIN_ACCESS_LOOKUP_INFO_1 )            
 
-//Access bits to User-objects
+/* Access bits to User-objects */
+
 #define USER_ACCESS_GET_NAME_ETC     0x000000001
 #define USER_ACCESS_GET_LOCALE       0x000000002
 #define USER_ACCESS_SET_LOC_COM      0x000000004
@@ -257,7 +260,8 @@ SamrTestPrivateFunctionsUser
                              USER_ACCESS_CHANGE_PASSWORD     | \
                             USER_ACCESS_GET_NAME_ETC )
 
-//Access bits to Group-objects                      
+/* Access bits to Group-objects */
+
 #define GROUP_ACCESS_LOOKUP_INFO     0x00000001
 #define GROUP_ACCESS_SET_INFO        0x00000002
 #define GROUP_ACCESS_ADD_MEMBER      0x00000004
@@ -282,7 +286,8 @@ SamrTestPrivateFunctionsUser
 #define GROUP_EXECUTE      ( STANDARD_RIGHTS_EXECUTE_ACCESS  | \
                              GROUP_ACCESS_LOOKUP_INFO )
                             
-//Access bits to Alias-objects
+/* Access bits to Alias-objects */
+
 #define ALIAS_ACCESS_ADD_MEMBER      0x00000001
 #define ALIAS_ACCESS_REMOVE_MEMBER   0x00000002
 #define ALIAS_ACCESS_GET_MEMBERS     0x00000004

diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 4284c96f204a9bfdaa6537d984f2bfd37ba35d30..88d728d8107b2e207124d3ab7485ae4b9f0b3a82 100644 (file)
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -661,13 +661,13 @@ NTSTATUS _samr_query_sec_obj(pipes_struct *p, SAMR_Q_QUERY_SEC_OBJ *q_u, SAMR_R_
                DEBUG(5,("_samr_query_sec_obj: querying security on SAM\n"));
                r_u->status = samr_make_sam_obj_sd(p->mem_ctx, &psd, &sd_size);
        }
-       else if (sid_equal(&pol_sid,get_global_sam_sid()))  //check if it is our domain SID
+       else if (sid_equal(&pol_sid,get_global_sam_sid()))  /* check if it is our domain SID */
 
        {
                DEBUG(5,("_samr_query_sec_obj: querying security on Domain with SID: %s\n", sid_to_string(str_sid, &pol_sid)));
                r_u->status = samr_make_dom_obj_sd(p->mem_ctx, &psd, &sd_size);
        }
-       else if (sid_equal(&pol_sid,&global_sid_Builtin)) //check if it is the Builtin  Domain
+       else if (sid_equal(&pol_sid,&global_sid_Builtin)) /* check if it is the Builtin  Domain */
        {
                /* TODO: Builtin probably needs a different SD with restricted write access*/
                DEBUG(5,("_samr_query_sec_obj: querying security on Builtin Domain with SID: %s\n", sid_to_string(str_sid, &pol_sid)));