diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-02-05 16:39:28 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-02-05 16:39:28 +0100 |
| commit | 6d139ca4680abcbda5110f2f0886aa038ff62088 (patch) | |
| tree | 7d61db40fb058bcbf08ccd8e0dadc365b819371b /source4/winbind/idmap.c | |
| parent | 4a9b3052caeb8bb144803b49dcfae82395172bc3 (diff) | |
| parent | afa960cbbcd609123d710c301e7a9a070c1fed70 (diff) | |
| download | samba-6d139ca4680abcbda5110f2f0886aa038ff62088.tar.gz samba-6d139ca4680abcbda5110f2f0886aa038ff62088.tar.bz2 samba-6d139ca4680abcbda5110f2f0886aa038ff62088.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Conflicts:
librpc/ndr.pc.in
Diffstat (limited to 'source4/winbind/idmap.c')
| -rw-r--r-- | source4/winbind/idmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/winbind/idmap.c b/source4/winbind/idmap.c index f7be59136c..d0efbb159b 100644 --- a/source4/winbind/idmap.c +++ b/source4/winbind/idmap.c @@ -29,7 +29,7 @@ #include "lib/ldb_wrap.h" #include "param/param.h" #include "winbind/idmap.h" -#include "libcli/security/proto.h" +#include "libcli/security/security.h" #include "libcli/ldap/ldap_ndr.h" /** |