diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-01-12 11:29:02 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-01-12 11:29:02 +0000 |
| commit | ebb60c0302482d347bed123795864c178defb08e (patch) | |
| tree | 18bea8a221bdb45666e486a31a4b1cc256f504e8 | |
| parent | 6152b8455859dcb85cdd64933aadeafefdd8c938 (diff) | |
| download | samba-ebb60c0302482d347bed123795864c178defb08e.tar.gz samba-ebb60c0302482d347bed123795864c178defb08e.tar.bz2 samba-ebb60c0302482d347bed123795864c178defb08e.zip | |
Make the 'service' in make_connection() use an fstrcpy(), and an fstring,
becouse that is what it's input (reply_tcon_and_x) uses, and becouse we really
don't want supprises for service names.
Also remove a legacy #define, in favor of the lp_ equiv.
Andrew Bartlett
(This used to be commit 7854a439ac601d3c23703b115cd5a8d4257c7717)
| -rw-r--r-- | source3/include/smb_macros.h | 1 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index 71d4bac795..95f7e05f7d 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -100,7 +100,6 @@ /* access various service details */ #define SERVICE(snum) (lp_servicename(snum)) -#define PRINTCAP (lp_printcapname()) #define PRINTCOMMAND(snum) (lp_printcommand(snum)) #define PRINTERNAME(snum) (lp_printername(snum)) #define CAN_WRITE(conn) (!conn->read_only) diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index ef5a090243..580878fe32 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -669,7 +669,7 @@ int reply_search(connection_struct *conn, char *inbuf,char *outbuf, int dum_size if (!conn->dirptr) goto SearchEmpty; string_set(&conn->dirpath,dptr_path(dptr_num)); - fstrcpy(mask, dptr_wcard(dptr_num)); + pstrcpy(mask, dptr_wcard(dptr_num)); } if (can_open) { |