diff options
| author | Sam Hartman <hartmans@mit.edu> | 2009-01-03 03:01:10 +0000 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 2009-01-03 03:01:10 +0000 |
| commit | f4ffab258cef42dd221d966db1142ffb93f55ce9 (patch) | |
| tree | 54849ce0425cffcc2947451d4cd3ef79eb026035 | |
| parent | d49058ce8595f1bed90a42bd23c9cba5797ba58a (diff) | |
| download | krb5-f4ffab258cef42dd221d966db1142ffb93f55ce9.zip krb5-f4ffab258cef42dd221d966db1142ffb93f55ce9.tar.gz krb5-f4ffab258cef42dd221d966db1142ffb93f55ce9.tar.bz2 | |
fix merge error
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/mskrb-integ@21680 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/kadmin/server/misc.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/kadmin/server/misc.h b/src/kadmin/server/misc.h index 6f9c5ff..b8aef57 100644 --- a/src/kadmin/server/misc.h +++ b/src/kadmin/server/misc.h @@ -70,7 +70,7 @@ int gss_to_krb5_name_1(struct svc_req *rqstp, krb5_context ctx, gss_name_t gss_name, krb5_principal *princ, gss_buffer_t gss_str); -<<<<<<< HEAD:src/kadmin/server/misc.h + extern volatile int signal_request_exit; extern volatile int signal_request_hup; @@ -84,8 +84,7 @@ krb5_error_code setup_network(void *handle, const char *prog); krb5_error_code listen_and_process(void *handle, const char *prog); krb5_error_code closedown_network(void *handle, const char *prog); -#endif /* _MISC_H */ -======= + void krb5_iprop_prog_1(struct svc_req *rqstp, SVCXPRT *transp); @@ -94,4 +93,5 @@ kiprop_get_adm_host_srv_name(krb5_context, const char *, char **); ->>>>>>> trunk:src/kadmin/server/misc.h + +#endif /* _MISC_H */ |