summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-03-16 13:24:36 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-03-16 13:24:36 +0000
commit7b18c5d1647b44f46cf973701b3bcc9aefb37e7d (patch)
tree827e69f838133525cbcb1bb7d264946846e1a4c6 /source3
parentc6cf08774114a906645a405dea8a7546d614de35 (diff)
downloadsamba-7b18c5d1647b44f46cf973701b3bcc9aefb37e7d.tar.gz
samba-7b18c5d1647b44f46cf973701b3bcc9aefb37e7d.tar.bz2
samba-7b18c5d1647b44f46cf973701b3bcc9aefb37e7d.zip
Make sure we mark the assumption of a fstring parameter for 'devicetype'
in the function prototype, and change callers to respect this. Andrew Bartlett (This used to be commit 9f3d3c380120f16d76d68f346799282d61eec892)
Diffstat (limited to 'source3')
-rw-r--r--source3/rpc_server/srv_srvsvc_nt.c9
-rw-r--r--source3/smbd/reply.c4
-rw-r--r--source3/smbd/service.c12
3 files changed, 15 insertions, 10 deletions
diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index 6d2320d67d..815dd75d22 100644
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -1840,6 +1840,8 @@ WERROR _srv_net_file_query_secdesc(pipes_struct *p, SRV_Q_NET_FILE_QUERY_SECDESC
struct current_user user;
connection_struct *conn = NULL;
BOOL became_user = False;
+ fstring dev;
+ fstrcpy(dev, "A:");
ZERO_STRUCT(st);
@@ -1853,7 +1855,7 @@ WERROR _srv_net_file_query_secdesc(pipes_struct *p, SRV_Q_NET_FILE_QUERY_SECDESC
get_current_user(&user, p);
become_root();
- conn = make_connection(qualname, null_pw, "A:", user.vuid, &nt_status);
+ conn = make_connection(qualname, null_pw, dev, user.vuid, &nt_status);
unbecome_root();
if (conn == NULL) {
@@ -1943,9 +1945,12 @@ WERROR _srv_net_file_set_secdesc(pipes_struct *p, SRV_Q_NET_FILE_SET_SECDESC *q_
struct current_user user;
connection_struct *conn = NULL;
BOOL became_user = False;
+ fstring dev;
+ fstrcpy(dev, "A:");
ZERO_STRUCT(st);
+
r_u->status = WERR_OK;
unistr2_to_ascii(qualname, &q_u->uni_qual_name, sizeof(qualname));
@@ -1956,7 +1961,7 @@ WERROR _srv_net_file_set_secdesc(pipes_struct *p, SRV_Q_NET_FILE_SET_SECDESC *q_
get_current_user(&user, p);
become_root();
- conn = make_connection(qualname, null_pw, "A:", user.vuid, &nt_status);
+ conn = make_connection(qualname, null_pw, dev, user.vuid, &nt_status);
unbecome_root();
if (conn == NULL) {
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 80f648981a..5ca0ae52de 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -148,7 +148,7 @@ int reply_tcon(connection_struct *conn,
const char *service;
pstring service_buf;
pstring password;
- pstring dev;
+ fstring dev;
int outsize = 0;
uint16 vuid = SVAL(inbuf,smb_uid);
int pwlen=0;
@@ -204,7 +204,7 @@ int reply_tcon_and_X(connection_struct *conn, char *inbuf,char *outbuf,int lengt
{
fstring service;
DATA_BLOB password;
- pstring devicename;
+ fstring devicename;
NTSTATUS nt_status;
uint16 vuid = SVAL(inbuf,smb_uid);
int passlen = SVAL(inbuf,smb_vwv3);
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 1c7e4017b0..a47e6c1bbc 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -218,7 +218,7 @@ int find_service(fstring service)
do some basic sainity checks on the share.
This function modifies dev, ecode.
****************************************************************************/
-static NTSTATUS share_sanity_checks(int snum, pstring dev)
+static NTSTATUS share_sanity_checks(int snum, fstring dev)
{
if (!lp_snum_ok(snum) ||
@@ -233,9 +233,9 @@ static NTSTATUS share_sanity_checks(int snum, pstring dev)
if (dev[0] == '?' || !dev[0]) {
if (lp_print_ok(snum)) {
- pstrcpy(dev,"LPT1:");
+ fstrcpy(dev,"LPT1:");
} else {
- pstrcpy(dev,"A:");
+ fstrcpy(dev,"A:");
}
}
@@ -248,7 +248,7 @@ static NTSTATUS share_sanity_checks(int snum, pstring dev)
/* Behave as a printer if we are supposed to */
if (lp_print_ok(snum) && (strcmp(dev, "A:") == 0)) {
- pstrcpy(dev, "LPT1:");
+ fstrcpy(dev, "LPT1:");
}
return NT_STATUS_OK;
@@ -326,7 +326,7 @@ static void set_admin_user(connection_struct *conn, gid_t *groups, size_t n_grou
static connection_struct *make_connection_snum(int snum, user_struct *vuser,
DATA_BLOB password,
- char *dev, NTSTATUS *status)
+ fstring dev, NTSTATUS *status)
{
struct passwd *pass = NULL;
BOOL guest = False;
@@ -747,7 +747,7 @@ connection_struct *make_connection_with_chdir(const char *service_in, DATA_BLOB
****************************************************************************/
connection_struct *make_connection(const char *service_in, DATA_BLOB password,
- char *dev, uint16 vuid, NTSTATUS *status)
+ fstring dev, uint16 vuid, NTSTATUS *status)
{
uid_t euid;
user_struct *vuser = NULL;