diff options
| author | Jeremy Allison <jra@samba.org> | 2009-04-09 22:46:59 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-04-09 22:46:59 -0700 |
| commit | 7f10bf980edef3ace1522d0c9c082b35e225c950 (patch) | |
| tree | d4e9af21de194cca812e754b28f9358a3651f4ce /source3/include/includes.h | |
| parent | f8f68703da58cf7f61b655b48bbbc45cda647748 (diff) | |
| parent | f930f504e1d5e78d2f6f36cab9ce36dbeb34e955 (diff) | |
| download | samba-7f10bf980edef3ace1522d0c9c082b35e225c950.tar.gz samba-7f10bf980edef3ace1522d0c9c082b35e225c950.tar.xz samba-7f10bf980edef3ace1522d0c9c082b35e225c950.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'source3/include/includes.h')
| -rw-r--r-- | source3/include/includes.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index c883e17713..433818d9ef 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -646,7 +646,6 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx); #include "ctdbd_conn.h" #include "../lib/util/talloc_stack.h" #include "memcache.h" -#include "../lib/async_req/async_req_ntstatus.h" #include "async_smb.h" #include "../lib/async_req/async_sock.h" #include "services.h" @@ -901,9 +900,10 @@ krb5_error_code smb_krb5_parse_name(krb5_context context, const char *name, /* in unix charset */ krb5_principal *principal); -krb5_error_code smb_krb5_unparse_name(krb5_context context, - krb5_const_principal principal, - char **unix_name); +krb5_error_code smb_krb5_unparse_name(TALLOC_CTX *mem_ctx, + krb5_context context, + krb5_const_principal principal, + char **unix_name); #ifndef HAVE_KRB5_SET_REAL_TIME krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds, int32_t microseconds); |