summaryrefslogtreecommitdiff
path: root/source3/utils
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2002-11-07 02:38:42 +0000
committerJeremy Allison <jra@samba.org>2002-11-07 02:38:42 +0000
commit47955b2f6cd10ac690705d322a8862c23f18072c (patch)
tree457151a2a3cc4ac3598c7cb45850b6dd598de03a /source3/utils
parentbcf0c11e3d4477eb029a0259ed17db9ddbe706d5 (diff)
downloadsamba-47955b2f6cd10ac690705d322a8862c23f18072c.tar.gz
samba-47955b2f6cd10ac690705d322a8862c23f18072c.tar.bz2
samba-47955b2f6cd10ac690705d322a8862c23f18072c.zip
Merge of scalable printing code fix... Needs testing.
Also tidied up some of Richard's code (I don't think he uses the compiler flags -g -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual like I do :-) :-). Jeremy. (This used to be commit 10024ed06e9d91f24fdc78d59eef2f76bf395438)
Diffstat (limited to 'source3/utils')
-rw-r--r--source3/utils/profiles.c10
-rw-r--r--source3/utils/smbcontrol.c3
2 files changed, 7 insertions, 6 deletions
diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c
index e7ffab9101..c7356a7323 100644
--- a/source3/utils/profiles.c
+++ b/source3/utils/profiles.c
@@ -514,7 +514,7 @@ void process_acl(ACL *acl, char *prefix)
}
}
-void usage(voi)
+void usage(void)
{
fprintf(stderr, "usage: profiles [-c <OLD-SID> -n <NEW-SID>] <profilefile>\n");
fprintf(stderr, "Version: %s\n", VERSION);
@@ -530,11 +530,9 @@ int main(int argc, char *argv[])
extern char *optarg;
extern int optind;
int opt;
- int i, fd, aces, start = 0;
- int process_sids = 0;
+ int fd, start = 0;
char *base;
struct stat sbuf;
- fstring sid_str;
REGF_HDR *regf_hdr;
HBIN_HDR *hbin_hdr;
NK_HDR *nk_hdr;
@@ -639,7 +637,7 @@ int main(int argc, char *argv[])
regf_hdr = (REGF_HDR *)base;
- if (verbose) fprintf(stdout, "Registry file size: %u\n", sbuf.st_size);
+ if (verbose) fprintf(stdout, "Registry file size: %u\n", (unsigned int)sbuf.st_size);
if (IVAL(&regf_hdr->REGF_ID, 0) != REG_REGF_ID) {
fprintf(stderr, "Incorrect Registry file (doesn't have header ID): %s\n", argv[optind]);
@@ -727,5 +725,5 @@ int main(int argc, char *argv[])
munmap(base, sbuf.st_size);
close(fd);
-
+ return 0;
}
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 5401755376..7c292dd521 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -360,7 +360,9 @@ static BOOL do_command(char *dest, char *msg_name, int iparams, char **params)
break;
/* Send a notification message to a printer */
+ /* NB. None of these currently work due to changes in the printing notify mechanisms. */
+#if 0
case MSG_PRINTER_NOTIFY2: {
char *cmd;
@@ -462,6 +464,7 @@ static BOOL do_command(char *dest, char *msg_name, int iparams, char **params)
break;
}
+#endif
case MSG_SMB_FORCE_TDIS:
if (!strequal(dest, "smbd")) {