diff options
| author | Jeremy Allison <jra@samba.org> | 1998-11-11 23:31:37 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-11-11 23:31:37 +0000 |
| commit | f9584f93be33ee69912708e6402809f47703a5d5 (patch) | |
| tree | e5e2ce5e6cceed60a0a77915a1e500af2dc10edb | |
| parent | f49b994aeb987ac87c3c49f35ae1e05a7004f75d (diff) | |
| download | samba-f9584f93be33ee69912708e6402809f47703a5d5.tar.gz samba-f9584f93be33ee69912708e6402809f47703a5d5.tar.bz2 samba-f9584f93be33ee69912708e6402809f47703a5d5.zip | |
J.F.'s latest printer fixes plus his gcc -picky fix for web/cgi.c
Jeremy.
(This used to be commit bd4e2972f50cafd932a5c915cdeeef7eedda07cc)
| -rw-r--r-- | source3/printing/printing.c | 4 | ||||
| -rw-r--r-- | source3/web/cgi.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source3/printing/printing.c b/source3/printing/printing.c index 2aecb58047..09a574c2c9 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -323,8 +323,10 @@ static BOOL parse_lpq_lprng(char *line,print_queue_struct *buf,BOOL first) char *tokarr[LPRNG_MAXTOK]; char *cptr; int num_tok = 0; + pstring line2; - tokarr[0] = strtok(line," \t"); + pstrcpy(line2,line); + tokarr[0] = strtok(line2," \t"); num_tok++; while (((tokarr[num_tok] = strtok(NULL," \t")) != NULL) && (num_tok < LPRNG_MAXTOK)) { diff --git a/source3/web/cgi.c b/source3/web/cgi.c index 86366d1083..41d099bac9 100644 --- a/source3/web/cgi.c +++ b/source3/web/cgi.c @@ -411,7 +411,7 @@ void cgi_setup(char *rootdir, int auth_required) char *x; /* Save the users name if available */ - if (x = getenv("REMOTE_USER")) { + if ((x = getenv("REMOTE_USER"))!=NULL) { C_user = strdup(x); } else { C_user = ""; |