diff options
| author | Jeremy Allison <jra@samba.org> | 2005-06-24 20:25:18 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:58:00 -0500 |
| commit | 19ca97a70f6b7b41d251eaa76e4d3c980c6eedff (patch) | |
| tree | 18d7d81e2c1aa7cf9325899b7e8fc90b41c14c8b /source3/utils/profiles.c | |
| parent | 8387af752f81e26f1c141f6053bf6d106f0af5eb (diff) | |
| download | samba-19ca97a70f6b7b41d251eaa76e4d3c980c6eedff.tar.gz samba-19ca97a70f6b7b41d251eaa76e4d3c980c6eedff.tar.bz2 samba-19ca97a70f6b7b41d251eaa76e4d3c980c6eedff.zip | |
r7882: Looks like a large patch - but what it actually does is make Samba
safe for using our headers and linking with C++ modules. Stops us
from using C++ reserved keywords in our code.
Jeremy
(This used to be commit 9506b8e145982b1160a2f0aee5c9b7a54980940a)
Diffstat (limited to 'source3/utils/profiles.c')
| -rw-r--r-- | source3/utils/profiles.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c index 0830d6b74b..b718770ba3 100644 --- a/source3/utils/profiles.c +++ b/source3/utils/profiles.c @@ -395,7 +395,7 @@ static void print_sid(DOM_SID *sid); int verbose = 1; DOM_SID old_sid, new_sid; -int change = 0, new = 0; +int change = 0, new_val = 0; /* Compare two SIDs for equality */ static int my_sid_equal(DOM_SID *s1, DOM_SID *s2) @@ -562,7 +562,7 @@ int main(int argc, char *argv[]) break; case 'n': - new = 1; + new_val = 1; if (!get_sid(&new_sid, poptGetOptArg(pc))) { fprintf(stderr, "Argument to -n should be a SID in form of S-1-5-...\n"); poptPrintUsage(pc, stderr, 0); @@ -584,7 +584,7 @@ int main(int argc, char *argv[]) exit(1); } - if ((!change & new) || (change & !new)) { + if ((!change & new_val) || (change & !new_val)) { fprintf(stderr, "You must specify both -c and -n if one or the other is set!\n"); poptPrintUsage(pc, stderr, 0); exit(252); |