diff options
author | Volker Lendecke <vl@samba.org> | 2010-01-24 18:51:58 +0100 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2010-01-26 14:55:36 +0100 |
commit | e2e48df6dc9efb245f4c16d46f487a065d806d99 (patch) | |
tree | 6a49d34d0be977b1085a087f236d16ec8942165a /source3/utils | |
parent | a97d76b1515be57746b22413ec4bc1533feee71d (diff) | |
download | samba-e2e48df6dc9efb245f4c16d46f487a065d806d99.tar.gz |
s3: Fix a bug in net's use of popt
In order to add --use-ccache to net, I added another "bool opt_ccache;" to
struct net_context. popt did not like this, it took a while to figure out why.
Popt has the lines
/* XXX Check alignment, may fail on funky platforms. */
if (arg == NULL || (((unsigned long)arg) & (sizeof(*arg)-1)))
return POPT_ERROR_NULLARG;
The "bool opt_ccache;" was not aligned anymore...
(cherry picked from commit 340277382518c62e23faae4af69a9c5c32b96af2)
Diffstat (limited to 'source3/utils')
-rw-r--r-- | source3/utils/net.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/utils/net.h b/source3/utils/net.h index 765b61bd564..3978459a624 100644 --- a/source3/utils/net.h +++ b/source3/utils/net.h @@ -70,7 +70,7 @@ struct net_context { const char *opt_exclude; const char *opt_destination; int opt_testmode; - bool opt_kerberos; + int opt_kerberos; int opt_force_full_repl; int opt_single_obj_repl; int opt_clean_old_entries; |