summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/doserr.h7
-rw-r--r--source3/include/nt_printing.h2
-rw-r--r--source3/include/rpc_dfs.h2
-rw-r--r--source3/include/rpc_lsa.h1
-rw-r--r--source3/include/rpc_netlogon.h13
-rwxr-xr-xsource3/include/rpc_spoolss.h85
-rw-r--r--source3/include/rpcclient.h2
7 files changed, 57 insertions, 55 deletions
diff --git a/source3/include/doserr.h b/source3/include/doserr.h
index cfc94a359a..bdb7da5956 100644
--- a/source3/include/doserr.h
+++ b/source3/include/doserr.h
@@ -141,14 +141,21 @@
#define WERR_BADFUNC W_ERROR(1)
#define WERR_INSUFFICIENT_BUFFER W_ERROR(122)
#define WERR_INVALID_PARAM W_ERROR(87)
+#define WERR_NOT_SUPPORTED W_ERROR(50)
+#define WERR_BAD_PASSWORD W_ERROR(86)
#define WERR_NOMEM W_ERROR(8)
#define WERR_INVALID_NAME W_ERROR(123)
#define WERR_UNKNOWN_LEVEL W_ERROR(124)
#define WERR_NO_MORE_ITEMS W_ERROR(259)
+#define WERR_MORE_DATA W_ERROR(234)
#define WERR_UNKNOWN_PRINTER_DRIVER W_ERROR(1797)
#define WERR_INVALID_PRINTER_NAME W_ERROR(1801)
#define WERR_INVALID_DATATYPE W_ERROR(1804)
#define WERR_INVALID_ENVIRONMENT W_ERROR(1805)
+#define WERR_BUF_TOO_SMALL W_ERROR(2123)
+#define WERR_JOB_NOT_FOUND W_ERROR(2151)
+#define WERR_DEST_NOT_FOUND W_ERROR(2152)
#define WERR_PRINTER_DRIVER_IN_USE W_ERROR(3001)
+#define WERR_STATUS_MORE_ENTRIES W_ERROR(0x0105)
#endif /* _DOSERR_H */
diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h
index de21537116..61abc1a31b 100644
--- a/source3/include/nt_printing.h
+++ b/source3/include/nt_printing.h
@@ -231,7 +231,7 @@ typedef struct nt_printer_info_level_2
uint32 default_priority;
uint32 starttime;
uint32 untiltime;
- NTSTATUS status;
+ WERROR status;
uint32 cjobs;
uint32 averageppm;
fstring servername;
diff --git a/source3/include/rpc_dfs.h b/source3/include/rpc_dfs.h
index 57a633b8e6..85be2cdabd 100644
--- a/source3/include/rpc_dfs.h
+++ b/source3/include/rpc_dfs.h
@@ -55,7 +55,7 @@ DFS_Q_DFS_EXIST;
/* status == 1 if dfs exists. */
typedef struct dfs_r_dfs_exist
{
- NTSTATUS status;
+ uint32 status;
}
DFS_R_DFS_EXIST;
diff --git a/source3/include/rpc_lsa.h b/source3/include/rpc_lsa.h
index 0814620980..e9df7f406e 100644
--- a/source3/include/rpc_lsa.h
+++ b/source3/include/rpc_lsa.h
@@ -365,7 +365,6 @@ typedef struct lsa_r_lookup_names
uint32 mapped_count;
NTSTATUS status; /* return code */
-
} LSA_R_LOOKUP_NAMES;
/* This is probably a policy handle but at the moment we
diff --git a/source3/include/rpc_netlogon.h b/source3/include/rpc_netlogon.h
index 6b00f7fd28..5fea305c4c 100644
--- a/source3/include/rpc_netlogon.h
+++ b/source3/include/rpc_netlogon.h
@@ -363,11 +363,9 @@ typedef struct net_q_auth2_info
/* NET_R_AUTH_2 */
typedef struct net_r_auth2_info
{
- DOM_CHAL srv_chal; /* server-calculated credentials */
- NEG_FLAGS srv_flgs; /* usually 0x0000 01ff */
-
- NTSTATUS status; /* return code */
-
+ DOM_CHAL srv_chal; /* server-calculated credentials */
+ NEG_FLAGS srv_flgs; /* usually 0x0000 01ff */
+ NTSTATUS status; /* return code */
} NET_R_AUTH_2;
@@ -725,7 +723,7 @@ typedef struct net_r_sam_sync_info
SAM_DELTA_HDR *hdr_deltas;
SAM_DELTA_CTR *deltas;
- uint32 status;
+ NTSTATUS status;
} NET_R_SAM_SYNC;
/* NET_Q_SAM_DELTAS */
@@ -757,8 +755,7 @@ typedef struct net_r_sam_deltas_info
SAM_DELTA_HDR *hdr_deltas;
SAM_DELTA_CTR *deltas;
- uint32 status;
-
+ NTSTATUS status;
} NET_R_SAM_DELTAS;
#endif /* _RPC_NETLOGON_H */
diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index bf58e1cce7..82d7d70d4f 100755
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -460,8 +460,7 @@ SPOOL_Q_OPEN_PRINTER_EX;
typedef struct spool_r_open_printer_ex
{
POLICY_HND handle; /* handle used along all transactions (20*uint8) */
- NTSTATUS status;
-
+ WERROR status;
}
SPOOL_R_OPEN_PRINTER_EX;
@@ -523,7 +522,7 @@ typedef struct spool_r_getprinterdata
uint32 size;
uint8 *data;
uint32 needed;
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_GETPRINTERDATA;
@@ -536,7 +535,7 @@ SPOOL_Q_DELETEPRINTERDATA;
typedef struct spool_r_deleteprinterdata
{
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_DELETEPRINTERDATA;
@@ -549,7 +548,7 @@ SPOOL_Q_CLOSEPRINTER;
typedef struct spool_r_closeprinter
{
POLICY_HND handle;
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_CLOSEPRINTER;
@@ -561,7 +560,7 @@ SPOOL_Q_STARTPAGEPRINTER;
typedef struct spool_r_startpageprinter
{
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_STARTPAGEPRINTER;
@@ -573,7 +572,7 @@ SPOOL_Q_ENDPAGEPRINTER;
typedef struct spool_r_endpageprinter
{
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_ENDPAGEPRINTER;
@@ -589,7 +588,7 @@ SPOOL_Q_DELETEPRINTERDRIVER;
typedef struct spool_r_deleteprinterdriver
{
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_DELETEPRINTERDRIVER;
@@ -641,7 +640,7 @@ SPOOL_Q_ENDDOCPRINTER;
typedef struct spool_r_enddocprinter
{
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_ENDDOCPRINTER;
@@ -657,7 +656,7 @@ SPOOL_Q_WRITEPRINTER;
typedef struct spool_r_writeprinter
{
uint32 buffer_written;
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_WRITEPRINTER;
@@ -718,7 +717,7 @@ SPOOL_Q_RFFPCNEX;
typedef struct spool_r_rffpcnex
{
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_RFFPCNEX;
@@ -749,7 +748,7 @@ SPOOL_Q_FCPN;
typedef struct spool_r_fcpn
{
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_FCPN;
@@ -1010,7 +1009,7 @@ typedef struct spool_r_addjob
{
NEW_BUFFER *buffer;
uint32 needed;
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_ADDJOB;
@@ -1042,7 +1041,7 @@ typedef struct s_job_info_1
UNISTR document;
UNISTR datatype;
UNISTR text_status;
- NTSTATUS status;
+ uint32 status;
uint32 priority;
uint32 position;
uint32 totalpages;
@@ -1066,7 +1065,7 @@ typedef struct s_job_info_2
DEVICEMODE *devmode;
UNISTR text_status;
/* SEC_DESC sec_desc;*/
- NTSTATUS status;
+ uint32 status;
uint32 priority;
uint32 position;
uint32 starttime;
@@ -1106,7 +1105,7 @@ typedef struct spool_r_enumjobs
NEW_BUFFER *buffer;
uint32 needed;
uint32 returned;
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_ENUMJOBS;
@@ -1119,7 +1118,7 @@ SPOOL_Q_SCHEDULEJOB;
typedef struct spool_r_schedulejob
{
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_SCHEDULEJOB;
@@ -1166,7 +1165,7 @@ typedef struct spool_r_enumports
NEW_BUFFER *buffer;
uint32 needed; /* bytes needed */
uint32 returned; /* number of printers */
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_ENUMPORTS;
@@ -1201,7 +1200,7 @@ SPOOL_Q_SETJOB;
typedef struct spool_r_setjob
{
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_SETJOB;
@@ -1223,7 +1222,7 @@ typedef struct spool_r_enumprinterdrivers
NEW_BUFFER *buffer;
uint32 needed;
uint32 returned;
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_ENUMPRINTERDRIVERS;
@@ -1254,7 +1253,7 @@ typedef struct spool_r_enumforms
NEW_BUFFER *buffer;
uint32 needed;
uint32 numofforms;
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_ENUMFORMS;
@@ -1272,7 +1271,7 @@ typedef struct spool_r_getform
{
NEW_BUFFER *buffer;
uint32 needed;
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_GETFORM;
@@ -1307,7 +1306,7 @@ typedef struct spool_printer_info_level_2
uint32 default_priority;
uint32 starttime;
uint32 untiltime;
- NTSTATUS status;
+ WERROR status;
uint32 cjobs;
uint32 averageppm;
UNISTR2 servername;
@@ -1454,7 +1453,7 @@ SPOOL_Q_SETPRINTER;
typedef struct spool_r_setprinter
{
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_SETPRINTER;
@@ -1474,7 +1473,7 @@ SPOOL_Q_ADDPRINTER;
typedef struct spool_r_addprinter
{
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_ADDPRINTER;
@@ -1487,7 +1486,7 @@ SPOOL_Q_DELETEPRINTER;
typedef struct spool_r_deleteprinter
{
POLICY_HND handle;
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_DELETEPRINTER;
@@ -1499,7 +1498,7 @@ SPOOL_Q_ABORTPRINTER;
typedef struct spool_r_abortprinter
{
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_ABORTPRINTER;
@@ -1522,7 +1521,7 @@ SPOOL_Q_ADDPRINTEREX;
typedef struct spool_r_addprinterex
{
POLICY_HND handle;
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_ADDPRINTEREX;
@@ -1538,7 +1537,7 @@ SPOOL_Q_ADDPRINTERDRIVER;
typedef struct spool_r_addprinterdriver
{
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_ADDPRINTERDRIVER;
@@ -1571,7 +1570,7 @@ typedef struct spool_r_getprinterdriverdirectory
{
NEW_BUFFER *buffer;
uint32 needed;
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_GETPRINTERDRIVERDIR;
@@ -1587,7 +1586,7 @@ SPOOL_Q_ADDPRINTPROCESSOR;
typedef struct spool_r_addprintprocessor
{
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_ADDPRINTPROCESSOR;
@@ -1615,7 +1614,7 @@ typedef struct spool_r_enumprintprocessors
NEW_BUFFER *buffer;
uint32 needed;
uint32 returned;
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_ENUMPRINTPROCESSORS;
@@ -1642,7 +1641,7 @@ typedef struct spool_r_enumprintprocdatatypes
NEW_BUFFER *buffer;
uint32 needed;
uint32 returned;
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_ENUMPRINTPROCDATATYPES;
@@ -1675,7 +1674,7 @@ typedef struct spool_r_enumprintmonitors
NEW_BUFFER *buffer;
uint32 needed;
uint32 returned;
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_ENUMPRINTMONITORS;
@@ -1698,7 +1697,7 @@ typedef struct spool_r_enumprinterdata
uint32 datasize;
uint8 *data;
uint32 realdatasize;
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_ENUMPRINTERDATA;
@@ -1716,7 +1715,7 @@ SPOOL_Q_SETPRINTERDATA;
typedef struct spool_r_setprinterdata
{
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_SETPRINTERDATA;
@@ -1745,7 +1744,7 @@ SPOOL_Q_ADDFORM;
typedef struct spool_r_addform
{
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_ADDFORM;
@@ -1761,7 +1760,7 @@ SPOOL_Q_SETFORM;
typedef struct spool_r_setform
{
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_SETFORM;
@@ -1774,7 +1773,7 @@ SPOOL_Q_DELETEFORM;
typedef struct spool_r_deleteform
{
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_DELETEFORM;
@@ -1805,7 +1804,7 @@ typedef struct spool_r_getjob
{
NEW_BUFFER *buffer;
uint32 needed;
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_GETJOB;
@@ -1822,7 +1821,7 @@ SPOOL_Q_REPLYOPENPRINTER;
typedef struct spool_r_replyopenprinter
{
POLICY_HND handle;
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_REPLYOPENPRINTER;
@@ -1835,7 +1834,7 @@ SPOOL_Q_REPLYCLOSEPRINTER;
typedef struct spool_r_replycloseprinter
{
POLICY_HND handle;
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_REPLYCLOSEPRINTER;
@@ -1854,7 +1853,7 @@ SPOOL_Q_REPLY_RRPCN;
typedef struct spool_r_rrpcn
{
uint32 unknown0;
- NTSTATUS status;
+ WERROR status;
}
SPOOL_R_REPLY_RRPCN;
diff --git a/source3/include/rpcclient.h b/source3/include/rpcclient.h
index e6fc67674f..7c1b0123b6 100644
--- a/source3/include/rpcclient.h
+++ b/source3/include/rpcclient.h
@@ -25,7 +25,7 @@
struct cmd_set {
char *name;
- uint32 (*fn)(struct cli_state*, int argc, char **argv);
+ NTSTATUS (*fn)(struct cli_state*, int argc, char **argv);
char *description;
char *usage;
};
generated by cgit (git 2.34.1) at 2024-12-03 11:29:05 +0000