r4980: Copy RAP callno constants from Samba 3 and start to use them.

diff --git a/source/include/rap.h b/source/include/rap.h
index c184be64834ac56be15f2fdd4b353f4339405654..0477192d9e7f5e3f2e8021b61fd516be38f67c16 100644 (file)
--- a/source/include/rap.h
+++ b/source/include/rap.h
@@ -18,6 +18,267 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#define RAP_WshareEnum                         0
+#define RAP_WshareGetInfo                      1
+#define RAP_WshareSetInfo                      2
+#define RAP_WshareAdd                          3
+#define RAP_WshareDel                          4
+#define RAP_NetShareCheck                      5
+#define RAP_WsessionEnum                       6
+#define RAP_WsessionGetInfo                    7
+#define RAP_WsessionDel                                8
+#define RAP_WconnectionEnum                    9
+#define RAP_WfileEnum                          10
+#define RAP_WfileGetInfo                       11
+#define RAP_WfileClose                         12
+#define RAP_WserverGetInfo                     13
+#define RAP_WserverSetInfo                     14
+#define RAP_WserverDiskEnum                    15
+#define RAP_WserverAdminCommand                        16
+#define RAP_NetAuditOpen                       17
+#define RAP_WauditClear                                18
+#define RAP_NetErrorLogOpen                    19
+#define RAP_WerrorLogClear                     20
+#define RAP_NetCharDevEnum                     21
+#define RAP_NetCharDevGetInfo                  22
+#define RAP_WCharDevControl                    23
+#define RAP_NetCharDevQEnum                    24
+#define RAP_NetCharDevQGetInfo                 25
+#define RAP_WCharDevQSetInfo                   26
+#define RAP_WCharDevQPurge                     27
+#define RAP_WCharDevQPurgeSelf                 28
+#define RAP_WMessageNameEnum                   29
+#define RAP_WMessageNameGetInfo                30
+#define RAP_WMessageNameAdd                    31
+#define RAP_WMessageNameDel                    32
+#define RAP_WMessageNameFwd                    33
+#define RAP_WMessageNameUnFwd                  34
+#define RAP_WMessageBufferSend                 35
+#define RAP_WMessageFileSend                   36
+#define RAP_WMessageLogFileSet                 37
+#define RAP_WMessageLogFileGet                 38
+#define RAP_WServiceEnum                       39
+#define RAP_WServiceInstall                    40
+#define RAP_WServiceControl                    41
+#define RAP_WAccessEnum                                42
+#define RAP_WAccessGetInfo                     43
+#define RAP_WAccessSetInfo                     44
+#define RAP_WAccessAdd                         45
+#define RAP_WAccessDel                         46
+#define RAP_WGroupEnum                         47
+#define RAP_WGroupAdd                          48
+#define RAP_WGroupDel                          49
+#define RAP_WGroupAddUser                      50
+#define RAP_WGroupDelUser                      51
+#define RAP_WGroupGetUsers                     52
+#define RAP_WUserEnum                          53
+#define RAP_WUserAdd                           54
+#define RAP_WUserDel                           55
+#define RAP_WUserGetInfo                       56
+#define RAP_WUserSetInfo                       57
+#define RAP_WUserPasswordSet                   58
+#define RAP_WUserGetGroups                     59
+#define RAP_WWkstaSetUID                       62
+#define RAP_WWkstaGetInfo                      63
+#define RAP_WWkstaSetInfo                      64
+#define RAP_WUseEnum                           65
+#define RAP_WUseAdd                            66
+#define RAP_WUseDel                            67
+#define RAP_WUseGetInfo                                68
+#define RAP_WPrintQEnum                                69
+#define RAP_WPrintQGetInfo                     70
+#define RAP_WPrintQSetInfo                     71
+#define RAP_WPrintQAdd                         72
+#define RAP_WPrintQDel                         73
+#define RAP_WPrintQPause                       74
+#define RAP_WPrintQContinue                    75
+#define RAP_WPrintJobEnum                      76
+#define RAP_WPrintJobGetInfo                   77
+#define RAP_WPrintJobSetInfo_OLD               78
+#define RAP_WPrintJobDel                       81
+#define RAP_WPrintJobPause                     82
+#define RAP_WPrintJobContinue                  83
+#define RAP_WPrintDestEnum                     84
+#define RAP_WPrintDestGetInfo                  85
+#define RAP_WPrintDestControl                  86
+#define RAP_WProfileSave                       87
+#define RAP_WProfileLoad                       88
+#define RAP_WStatisticsGet                     89
+#define RAP_WStatisticsClear                   90
+#define RAP_NetRemoteTOD                       91
+#define RAP_WNetBiosEnum                       92
+#define RAP_WNetBiosGetInfo                    93
+#define RAP_NetServerEnum                      94
+#define RAP_I_NetServerEnum                    95
+#define RAP_WServiceGetInfo                    96
+#define RAP_WPrintQPurge                       103
+#define RAP_NetServerEnum2                     104
+#define RAP_WAccessGetUserPerms                        105
+#define RAP_WGroupGetInfo                      106
+#define RAP_WGroupSetInfo                      107
+#define RAP_WGroupSetUsers                     108
+#define RAP_WUserSetGroups                     109
+#define RAP_WUserModalsGet                     110
+#define RAP_WUserModalsSet                     111
+#define RAP_WFileEnum2                         112
+#define RAP_WUserAdd2                          113
+#define RAP_WUserSetInfo2                      114
+#define RAP_WUserPasswordSet2                  115
+#define RAP_I_NetServerEnum2                   116
+#define RAP_WConfigGet2                                117
+#define RAP_WConfigGetAll2                     118
+#define RAP_WGetDCName                         119
+#define RAP_NetHandleGetInfo                   120
+#define RAP_NetHandleSetInfo                   121
+#define RAP_WStatisticsGet2                    122
+#define RAP_WBuildGetInfo                      123
+#define RAP_WFileGetInfo2                      124
+#define RAP_WFileClose2                                125
+#define RAP_WNetServerReqChallenge             126
+#define RAP_WNetServerAuthenticate             127
+#define RAP_WNetServerPasswordSet              128
+#define RAP_WNetAccountDeltas                  129
+#define RAP_WNetAccountSync                    130
+#define RAP_WUserEnum2                         131
+#define RAP_WWkstaUserLogon                    132
+#define RAP_WWkstaUserLogoff                   133
+#define RAP_WLogonEnum                         134
+#define RAP_WErrorLogRead                      135
+#define RAP_NetPathType                                136
+#define RAP_NetPathCanonicalize                        137
+#define RAP_NetPathCompare                     138
+#define RAP_NetNameValidate                    139
+#define RAP_NetNameCanonicalize                        140
+#define RAP_NetNameCompare                     141
+#define RAP_WAuditRead                         142
+#define RAP_WPrintDestAdd                      143
+#define RAP_WPrintDestSetInfo                  144
+#define RAP_WPrintDestDel                      145
+#define RAP_WUserValidate2                     146
+#define RAP_WPrintJobSetInfo                   147
+#define RAP_TI_NetServerDiskEnum               148
+#define RAP_TI_NetServerDiskGetInfo            149
+#define RAP_TI_FTVerifyMirror                  150
+#define RAP_TI_FTAbortVerify                   151
+#define RAP_TI_FTGetInfo                       152
+#define RAP_TI_FTSetInfo                       153
+#define RAP_TI_FTLockDisk                      154
+#define RAP_TI_FTFixError                      155
+#define RAP_TI_FTAbortFix                      156
+#define RAP_TI_FTDiagnoseError                 157
+#define RAP_TI_FTGetDriveStats                 158
+#define RAP_TI_FTErrorGetInfo                  160
+#define RAP_NetAccessCheck                     163
+#define RAP_NetAlertRaise                      164
+#define RAP_NetAlertStart                      165
+#define RAP_NetAlertStop                       166
+#define RAP_NetAuditWrite                      167
+#define RAP_NetIRemoteAPI                      168
+#define RAP_NetServiceStatus                   169
+#define RAP_NetServerRegister                  170
+#define RAP_NetServerDeregister                        171
+#define RAP_NetSessionEntryMake                        172
+#define RAP_NetSessionEntryClear               173
+#define RAP_NetSessionEntryGetInfo             174
+#define RAP_NetSessionEntrySetInfo             175
+#define RAP_NetConnectionEntryMake             176
+#define RAP_NetConnectionEntryClear            177
+#define RAP_NetConnectionEntrySetInfo          178
+#define RAP_NetConnectionEntryGetInfo          179
+#define RAP_NetFileEntryMake                   180
+#define RAP_NetFileEntryClear                  181
+#define RAP_NetFileEntrySetInfo                        182
+#define RAP_NetFileEntryGetInfo                        183
+#define RAP_AltSrvMessageBufferSend            184
+#define RAP_AltSrvMessageFileSend              185
+#define RAP_wI_NetRplWkstaEnum                 186
+#define RAP_wI_NetRplWkstaGetInfo              187
+#define RAP_wI_NetRplWkstaSetInfo              188
+#define RAP_wI_NetRplWkstaAdd                  189
+#define RAP_wI_NetRplWkstaDel                  190
+#define RAP_wI_NetRplProfileEnum               191
+#define RAP_wI_NetRplProfileGetInfo            192
+#define RAP_wI_NetRplProfileSetInfo            193
+#define RAP_wI_NetRplProfileAdd                        194
+#define RAP_wI_NetRplProfileDel                        195
+#define RAP_wI_NetRplProfileClone              196
+#define RAP_wI_NetRplBaseProfileEnum           197
+#define RAP_WIServerSetInfo                    201
+#define RAP_WPrintDriverEnum                   205
+#define RAP_WPrintQProcessorEnum               206
+#define RAP_WPrintPortEnum                     207
+#define RAP_WNetWriteUpdateLog                 208
+#define RAP_WNetAccountUpdate                  209
+#define RAP_WNetAccountConfirmUpdate           210
+#define RAP_WConfigSet                         211
+#define RAP_WAccountsReplicate                 212                      
+#define RAP_SamOEMChgPasswordUser2_P           214
+#define RAP_NetServerEnum3                     215
+#define RAP_WprintDriverGetInfo                        250
+#define RAP_WprintDriverSetInfo                        251
+#define RAP_WaliasAdd                          252
+#define RAP_WaliasDel                          253
+#define RAP_WaliasGetInfo                      254
+#define RAP_WaliasSetInfo                      255
+#define RAP_WaliasEnum                         256
+#define RAP_WuserGetLogonAsn                   257
+#define RAP_WuserSetLogonAsn                   258
+#define RAP_WuserGetAppSel                     259
+#define RAP_WuserSetAppSel                     260
+#define RAP_WappAdd                            261
+#define RAP_WappDel                            262
+#define RAP_WappGetInfo                                263
+#define RAP_WappSetInfo                                264
+#define RAP_WappEnum                           265
+#define RAP_WUserDCDBInit                      266
+#define RAP_WDASDAdd                           267
+#define RAP_WDASDDel                           268
+#define RAP_WDASDGetInfo                       269
+#define RAP_WDASDSetInfo                       270
+#define RAP_WDASDEnum                          271
+#define RAP_WDASDCheck                         272
+#define RAP_WDASDCtl                           273
+#define RAP_WuserRemoteLogonCheck              274
+#define RAP_WUserPasswordSet3                  275
+#define RAP_WCreateRIPLMachine                 276
+#define RAP_WDeleteRIPLMachine                 277
+#define RAP_WGetRIPLMachineInfo                        278
+#define RAP_WSetRIPLMachineInfo                        279
+#define RAP_WEnumRIPLMachine                   280
+#define RAP_I_ShareAdd                         281
+#define RAP_AliasEnum                          282
+#define RAP_WaccessApply                       283
+#define RAP_WPrt16Query                                284
+#define RAP_WPrt16Set                          285
+#define RAP_WUserDel100                                286
+#define RAP_WUserRemoteLogonCheck2             287
+#define RAP_WRemoteTODSet                      294
+#define RAP_WprintJobMoveAll                   295
+#define RAP_W16AppParmAdd                      296
+#define RAP_W16AppParmDel                      297
+#define RAP_W16AppParmGet                      298
+#define RAP_W16AppParmSet                      299
+#define RAP_W16RIPLMachineCreate               300
+#define RAP_W16RIPLMachineGetInfo              301
+#define RAP_W16RIPLMachineSetInfo              302
+#define RAP_W16RIPLMachineEnum                 303
+#define RAP_W16RIPLMachineListParmEnum         304
+#define RAP_W16RIPLMachClassGetInfo            305
+#define RAP_W16RIPLMachClassEnum               306
+#define RAP_W16RIPLMachClassCreate             307
+#define RAP_W16RIPLMachClassSetInfo            308
+#define RAP_W16RIPLMachClassDelete             309
+#define RAP_W16RIPLMachClassLPEnum             310
+#define RAP_W16RIPLMachineDelete               311
+#define RAP_W16WSLevelGetInfo                  312
+#define RAP_WserverNameAdd                     313
+#define RAP_WserverNameDel                     314
+#define RAP_WserverNameEnum                    315
+#define RAP_I_WDASDEnum                                316
+#define RAP_WDASDEnumTerminate                 317
+#define RAP_WDASDSetInfo2                      318
+#define MAX_API                                        318
+
 struct rap_shareenum_info_0 {
        char name[13];
 };

diff --git a/source/ntvfs/ipc/ipc_rap.c b/source/ntvfs/ipc/ipc_rap.c
index e985d81baabaa935c2551af8fa27bfb04b9e5911..aedb7acaef9f3d39f6f110ff449c7fe410054f6a 100644 (file)
--- a/source/ntvfs/ipc/ipc_rap.c
+++ b/source/ntvfs/ipc/ipc_rap.c
@@ -374,16 +374,13 @@ static NTSTATUS api_Unsupported(struct smbsrv_request *req,
        return NT_STATUS_OK;
 }
 
-#define RAP_NetShareEnum 0
-#define RAP_NetServerEnum2 104
-
 static const struct
 {
        const char *name;
        int id;
        NTSTATUS (*fn)(struct smbsrv_request *req, struct rap_call *call);
 } api_commands[] = {
-       {"NetShareEnum", RAP_NetShareEnum, _rap_netshareenum },
+       {"NetShareEnum", RAP_WshareEnum, _rap_netshareenum },
        {"NetServerEnum2", RAP_NetServerEnum2, _rap_netserverenum2 },
        {NULL, -1, api_Unsupported}
 };

diff --git a/source/torture/rap/rap.c b/source/torture/rap/rap.c
index dd0654f90f2cbd12b4f05c72704f2b7248be041e..b176de92c8c3942eb7194ffe3d765689643d6212 100644 (file)
--- a/source/torture/rap/rap.c
+++ b/source/torture/rap/rap.c
@@ -213,7 +213,7 @@ static NTSTATUS smbcli_rap_netshareenum(struct smbcli_state *cli,
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        int i;
 
-       call = new_rap_cli_call(NULL, 0);
+       call = new_rap_cli_call(NULL, RAP_WshareEnum);
 
        if (call == NULL)
                return NT_STATUS_NO_MEMORY;
@@ -303,7 +303,7 @@ static NTSTATUS smbcli_rap_netserverenum2(struct smbcli_state *cli,
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        int i;
 
-       call = new_rap_cli_call(NULL, 104);
+       call = new_rap_cli_call(NULL, RAP_NetServerEnum2);
 
        if (call == NULL)
                return NT_STATUS_NO_MEMORY;
@@ -442,7 +442,7 @@ BOOL torture_rap_scan(void)
 {
        TALLOC_CTX *mem_ctx;
        struct smbcli_state *cli;
-       uint16 callno;
+       int callno;
 
        mem_ctx = talloc_init("torture_rap_scan");
 
@@ -456,12 +456,13 @@ BOOL torture_rap_scan(void)
 
                result = rap_cli_do_call(cli, call);
 
-               if (NT_STATUS_EQUAL(result, NT_STATUS_INVALID_PARAMETER))
-                       printf("callno %d is RAP call\n", callno);
+               if (!NT_STATUS_EQUAL(result, NT_STATUS_INVALID_PARAMETER))
+                       continue;
+
+               printf("callno %d is RAP call\n", callno);
        }
 
        torture_close_connection(cli);
 
-
        return True;
 }