nfs-utils: Misc cleanups & fixes
Subsystems (2)
cover nfs-utils: Misc cleanups & fixes
Again, here are various cleanups and fixes. Nothing too major, although a couple valgrind finds.
I've left out the printf patch for now, pending further discussion.
Thanks,
Doug
Doug Nazar (11):
Add error handling to libevent allocations.
gssd: Fix cccache buffer size
gssd: Fix handling of failed allocations
gssd: srchost should never be *
xlog: Reorganize xlog_backend() to work around -Wmaybe-uninitialized
nfsdcld: Add graceful exit handling and resource cleanup
nfsdcld: Don't copy more data than exists in column
svcgssd: Convert to using libevent
nfsidmap: Add support to cleanup resources on exit
svcgssd: Cleanup global resources on exit
svcgssd: Wait for nullrpc channel if not available
support/nfs/xlog.c | 41 ++++---- support/nfsidmap/libnfsidmap.c | 13 +++ support/nfsidmap/nfsidmap.h | 1 + support/nfsidmap/nfsidmap_common.c | 11 ++- support/nfsidmap/nfsidmap_private.h | 1 + support/nfsidmap/nss.c | 8 ++ utils/gssd/Makefile.am | 2 +- utils/gssd/gss_names.c | 6 +- utils/gssd/gss_util.c | 6 ++ utils/gssd/gss_util.h | 1 + utils/gssd/gssd.c | 37 +++++-- utils/gssd/krb5_util.c | 12 +-- utils/gssd/svcgssd.c | 143 ++++++++++++++++++++++++++-- utils/gssd/svcgssd.h | 3 +- utils/gssd/svcgssd_krb5.c | 21 ++-- utils/gssd/svcgssd_krb5.h | 1 + utils/gssd/svcgssd_main_loop.c | 94 ------------------ utils/gssd/svcgssd_proc.c | 15 +-- utils/idmapd/idmapd.c | 32 +++++++ utils/nfsdcld/nfsdcld.c | 50 +++++++++- utils/nfsdcld/sqlite.c | 33 +++++-- utils/nfsdcld/sqlite.h | 1 + 22 files changed, 358 insertions(+), 174 deletions(-) delete mode 100644 utils/gssd/svcgssd_main_loop.c
Signature · 1 line
2.26.2
PATCH 1/11 Add error handling to libevent allocations.
--- utils/gssd/gssd.c | 37 +++++++++++++++++++++++++++---------- utils/idmapd/idmapd.c | 32 ++++++++++++++++++++++++++++++++ utils/nfsdcld/nfsdcld.c | 18 +++++++++++++++++- 3 files changed, 76 insertions(+), 11 deletions(-)
utils/gssd/gssd.c +27 -10
@@ -560,14 +560,9 @@ static int gssd_scan_clnt(struct clnt_info *clp) {int clntfd; -bool gssd_was_closed; -bool krb5_was_closed;printerr (3 ,"scanning client %s\n" , clp->relpath); - gssd_was_closed = clp->gssd_fd <0 ? true : false; - krb5_was_closed = clp->krb5_fd <0 ? true : false; - clntfd =openat (pipefs_fd, clp->relpath,O_RDONLY );if (clntfd <0 ) {if (errno !=ENOENT )
@@ -582,16 +577,30 @@ gssd_scan_clnt(struct clnt_info *clp)if (clp->gssd_fd ==-1 && clp->krb5_fd ==-1 ) clp->krb5_fd =openat (clntfd,"krb5" ,O_RDWR |O_NONBLOCK ); -if (gssd_was_closed && clp->gssd_fd >=0 ) { +if (!clp->gssd_ev && clp->gssd_fd >=0 ) { clp->gssd_ev =event_new (evbase, clp->gssd_fd,EV_READ |EV_PERSIST , gssd_clnt_gssd_cb, clp); -event_add (clp->gssd_ev,NULL ); +if (!clp->gssd_ev) { +printerr (0 ,"ERROR: %s: can't create gssd event for %s: %s\n" , + __FUNCTION__, clp->relpath,strerror (errno)); +close (clp->gssd_fd); + clp->gssd_fd =-1 ; + }else { +event_add (clp->gssd_ev,NULL ); + } } -if (krb5_was_closed && clp->krb5_fd >=0 ) { +if (!clp->krb5_ev && clp->krb5_fd >=0 ) { clp->krb5_ev =event_new (evbase, clp->krb5_fd,EV_READ |EV_PERSIST , gssd_clnt_krb5_cb, clp); -event_add (clp->krb5_ev,NULL ); +if (!clp->krb5_ev) { +printerr (0 ,"ERROR: %s: can't create krb5 event for %s: %s\n" , + __FUNCTION__, clp->relpath,strerror (errno)); +close (clp->krb5_fd); + clp->krb5_fd =-1 ; + }else { +event_add (clp->krb5_ev,NULL ); + } }if (clp->krb5_fd ==-1 && clp->gssd_fd ==-1 )
@@ -1086,7 +1095,7 @@ main(int argc, char *argv[]) evbase =event_base_new ();if (!evbase) { -printerr (0 ,"ERROR: failed to create event base\n" ); +printerr (0 ,"ERROR: failed to create event base: %s\n" ,strerror (errno));exit (EXIT_FAILURE ); }
@@ -1111,9 +1120,17 @@ main(int argc, char *argv[])signal (SIGINT , sig_die);signal (SIGTERM , sig_die); sighup_ev =evsignal_new (evbase,SIGHUP , gssd_scan_cb,NULL ); +if (!sighup_ev) { +printerr (0 ,"ERROR: failed to create SIGHUP event: %s\n" ,strerror (errno)); +exit (EXIT_FAILURE ); + }evsignal_add (sighup_ev,NULL ); inotify_ev =event_new (evbase, inotify_fd,EV_READ |EV_PERSIST , gssd_inotify_cb,NULL ); +if (!inotify_ev) { +printerr (0 ,"ERROR: failed to create inotify event: %s\n" ,strerror (errno)); +exit (EXIT_FAILURE ); + }event_add (inotify_ev,NULL );TAILQ_INIT (&topdir_list);
utils/idmapd/idmapd.c +32 -0
@@ -400,13 +400,21 @@ main(int argc, char **argv)/* These events are persistent */ rootdirev =evsignal_new (evbase,SIGUSR1 , dirscancb, &icq); +if (rootdirev ==NULL ) +errx (1 ,"Failed to create SIGUSR1 event." );evsignal_add (rootdirev,NULL ); clntdirev =evsignal_new (evbase,SIGUSR2 , clntscancb, &icq); +if (clntdirev ==NULL ) +errx (1 ,"Failed to create SIGUSR2 event." );evsignal_add (clntdirev,NULL ); svrdirev =evsignal_new (evbase,SIGHUP , svrreopen,NULL ); +if (svrdirev ==NULL ) +errx (1 ,"Failed to create SIGHUP event." );evsignal_add (svrdirev,NULL );if ( wd >=0 ) { inotifyev =event_new (evbase, inotify_fd,EV_READ , dirscancb, &icq); +if (inotifyev ==NULL ) +errx (1 ,"Failed to create inotify read event." );event_add (inotifyev,NULL ); }
@@ -414,6 +422,8 @@ main(int argc, char **argv)/* (Delay till start of event_dispatch to avoid possibly losing * a SIGUSR1 between here and the call to event_dispatch().) */ initialize =evtimer_new (evbase, dirscancb, &icq); +if (initialize ==NULL ) +errx (1 ,"Failed to create initialize event." );evtimer_add (initialize, &now); }
@@ -768,6 +778,13 @@ nfsdreopen_one(struct idmap_client *ic) ic->ic_fd = fd; ic->ic_event =event_new (evbase, ic->ic_fd,EV_READ , nfsdcb, ic); +if (ic->ic_event ==NULL ) { +xlog_warn ("nfsdreopen: Failed to create event for '%s'" , + ic->ic_path); +close (ic->ic_fd); + ic->ic_fd =-1 ; +return ; + }event_add (ic->ic_event,NULL ); }else { xlog_warn("nfsdreopen: Opening '%s' failed: errno %d (%s)",
@@ -802,6 +819,14 @@ nfsdopenone(struct idmap_client *ic) } ic->ic_event =event_new (evbase, ic->ic_fd,EV_READ , nfsdcb, ic); +if (ic->ic_event ==NULL ) { +if (verbose >0 ) +xlog_warn ("nfsdopenone: Create event for %s failed" , + ic->ic_path); +close (ic->ic_fd); + ic->ic_fd =-1 ; +return (-1 ); + }event_add (ic->ic_event,NULL );if (verbose >0 )
@@ -826,6 +851,13 @@ nfsopen(struct idmap_client *ic) } }else { ic->ic_event =event_new (evbase, ic->ic_fd,EV_READ , nfscb, ic); +if (ic->ic_event ==NULL ) { +xlog_warn ("nfsdopenone: Create event for %s failed" , + ic->ic_path); +close (ic->ic_fd); + ic->ic_fd =-1 ; +return -1 ; + }event_add (ic->ic_event,NULL );fcntl (ic->ic_dirfd,F_NOTIFY ,0 );fcntl (ic->ic_dirfd,F_SETSIG ,0 );
utils/nfsdcld/nfsdcld.c +17 -1
@@ -142,6 +142,7 @@ static int cld_pipe_open(struct cld_client *clnt) {int fd; +struct event *ev;xlog (D_GENERAL ,"%s: opening upcall pipe %s" , __func__, pipepath); fd =open (pipepath,O_RDWR ,0 );
@@ -150,6 +151,13 @@ cld_pipe_open(struct cld_client *clnt)return -errno; } + ev =event_new (evbase, fd,EV_READ , cldcb, clnt); +if (ev ==NULL ) { +xlog (D_GENERAL ,"%s: failed to create event for %s" , __func__, pipepath); +close (fd); +return -ENOMEM ; + } +if (clnt->cl_event &&event_initialized (clnt->cl_event)) {event_del (clnt->cl_event);event_free (clnt->cl_event);
@@ -158,7 +166,7 @@ cld_pipe_open(struct cld_client *clnt)close (clnt->cl_fd); clnt->cl_fd = fd; - clnt->cl_event =event_new (evbase, clnt->cl_fd,EV_READ , cldcb, clnt); + clnt->cl_event = ev;/* event_add is done by the caller */ return 0 ; }
@@ -304,6 +312,10 @@ cld_pipe_init(struct cld_client *clnt)/* set event for inotify read */ pipedir_event =event_new (evbase, inotify_fd,EV_READ , cld_inotify_cb, clnt); +if (pipedir_event ==NULL ) { +close (inotify_fd); +return -ENOMEM ; + }event_add (pipedir_event,NULL ); out:return ret;
@@ -768,6 +780,10 @@ main(int argc, char **argv) } evbase =event_base_new (); +if (evbase ==NULL ) { +fprintf (stderr,"%s: unable to allocate event base.\n" , argv[0 ]); +return 1 ; + }xlog_syslog (0 );xlog_stderr (1 );
Signature · 1 line
2.26.2
PATCH 2/11 gssd: Fix cccache buffer size
In reply to Doug Nazar--- utils/gssd/krb5_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
utils/gssd/krb5_util.c +1 -1
@@ -1225,7 +1225,7 @@ out:int gssd_setup_krb5_user_gss_ccache (uid_t uid,char *servername,char *dirpattern) { -char buf[PATH_MAX +2 +256 ], dirname[PATH_MAX ]; +char buf[PATH_MAX +4 +2 +256 ], dirname[PATH_MAX ];const char *cctype;struct dirent *d;int err, i, j;
Signature · 1 line
2.26.2
Re: [PATCH 02/11] gssd: Fix cccache buffer size
Hey Doug,
Quoted 11 lines · Doug Nazar
Signed-off-by Doug Nazar <[email protected]>--- utils/gssd/krb5_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)utils/gssd/krb5_util.c +0
-0
utils/gssd/krb5_util.c out: · line 1231
Quoted 8 lines
utils/gssd/krb5_util.c +1
-1@@ -1225,7 +1225,7 @@ out:int gssd_setup_krb5_user_gss_ccache (uid_t uid,char *servername,char *dirpattern) { -char buf[PATH_MAX +2 +256 ], dirname[PATH_MAX ]; +char buf[PATH_MAX +4 +2 +256 ], dirname[PATH_MAX ];const char *cctype;struct dirent *d;int err, i, j;
Thanks for point this out but I think I'm going to go with this:
utils/gssd/krb5_util.c +4 -2
@@ -223,7 +223,8 @@ gssd_find_existing_krb5_ccache(uid_t uid, char *dirname,int found =0 ;struct dirent *best_match_dir =NULL ;struct stat best_match_stat, tmp_stat; -char buf[PATH_MAX +4 +2 +256 ]; +/* dirname + cctype + d_name + NULL */ +char buf[PATH_MAX +5 +256 +1 ];char *princname =NULL ;char *realm =NULL ;int score, best_match_score =0 , err = -EACCES ;
@@ -1225,7 +1226,8 @@ out:int gssd_setup_krb5_user_gss_ccache (uid_t uid,char *servername,char *dirpattern) { -char buf[PATH_MAX +2 +256 ], dirname[PATH_MAX ]; +/* dirname + cctype + d_name + NULL */ +char buf[PATH_MAX +5 +256 +1 ], dirname[PATH_MAX ];const char *cctype;struct dirent *d;int err, i, j;
which explains the needed space and as well removes the warning...
steved
Re: [PATCH 02/11] gssd: Fix cccache buffer size
Quoted 6 lines · Steve Dickson
Thanks for point this out but I think I'm going to go with this:
utils/gssd/krb5_util.c +2
-1-char buf[PATH_MAX +4 +2 +256 ]; +/* dirname + cctype + d_name + NULL */ +char buf[PATH_MAX +5 +256 +1 ];which explains the needed space and as well removes the warning...
That's fine. I didn't spend much time wondering why it was written that way, just assumed there was a reason.
Doug
PATCH 3/11 gssd: Fix handling of failed allocations
In reply to Doug Nazar--- utils/gssd/gss_names.c | 6 ++++-- utils/gssd/krb5_util.c | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-)
utils/gssd/gss_names.c +4 -2
@@ -110,10 +110,12 @@ get_hostbased_client_name(gss_name_t client_name, gss_OID mech,/* For Kerberos, transform the NT_KRB5_PRINCIPAL name to * an NT_HOSTBASED_SERVICE name */ if (g_OID_equal (&krb5oid, mech)) { -if (get_krb5_hostbased_name (&name, &cname) ==0 ) - *hostbased_name = cname; +if (get_krb5_hostbased_name (&name, &cname) !=0 ) + goto out_rel_buf; + *hostbased_name = cname; }else {printerr (1 ,"WARNING: unknown/unsupport mech OID\n" ); + goto out_rel_buf; } res =0 ;
utils/gssd/krb5_util.c +4 -4
@@ -875,10 +875,10 @@ find_keytab_entry(krb5_context context, krb5_keytab kt,/* Compute the active directory machine name HOST$ */ krb5_appdefault_string (context,"nfs" ,NULL ,"ad_principal_name" , notsetstr, &adhostoverride); -if (strcmp (adhostoverride, notsetstr) !=0 ) { -printerr (1 , -"AD host string overridden with \"%s\" from appdefaults\n" , - adhostoverride); +if (adhostoverride &&strcmp (adhostoverride, notsetstr) !=0 ) { +printerr (1 , +"AD host string overridden with \"%s\" from appdefaults\n" , + adhostoverride);/* No overflow: Windows cannot handle strings longer than 19 chars */ strcpy (myhostad, adhostoverride); }else {
Signature · 1 line
2.26.2
PATCH 4/11 gssd: srchost should never be *
In reply to Doug NazarFix silly mistake on my part due to a rebase error.
--- utils/gssd/krb5_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
utils/gssd/krb5_util.c +1 -1
@@ -854,7 +854,7 @@ find_keytab_entry(krb5_context context, krb5_keytab kt, goto out;/* Get full local hostname */ -if (srchost &&strcmp (srchost,"*" ) !=0 ) { +if (srchost) {strcpy (myhostname, srchost);strcpy (myhostad, myhostname); }else {
Signature · 1 line
2.26.2
PATCH 5/11 xlog: Reorganize xlog_backend() to work around -Wmaybe-uninitialized
In reply to Doug Nazarxlog.c: In function ‘xlog_backend’:
xlog.c:202:3: warning: ‘args2’ may be used uninitialized in this function [-Wmaybe-uninitialized]
202 | vfprintf(stderr, fmt, args2);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~--- support/nfs/xlog.c | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-)
support/nfs/xlog.c +19 -22
@@ -156,13 +156,29 @@ xlog_enabled(int fac)void xlog_backend (int kind,const char *fmt,va_list args) { -va_list args2; -if (!(kind & (L_ALL )) && !(logging && (kind & logmask)))return ; -if (log_stderr) +if (log_stderr) { +va_list args2; +#ifdef VERBOSE_PRINTF +time_t now; +struct tm *tm; + +time (&now); + tm =localtime (&now); +fprintf (stderr,"%s[%d] %04d-%02d-%02d %02d:%02d:%02d " , + log_name, log_pid, + tm->tm_year+1900 , tm->tm_mon +1 , tm->tm_mday, + tm->tm_hour, tm->tm_min, tm->tm_sec); +#else +fprintf (stderr,"%s: " , log_name); +#endif va_copy (args2, args); +vfprintf (stderr, fmt, args2); +fprintf (stderr,"\n" ); +va_end (args2); + }if (log_syslog) {switch (kind) {
@@ -185,25 +201,6 @@ xlog_backend(int kind, const char *fmt, va_list args) } } -if (log_stderr) { -#ifdef VERBOSE_PRINTF -time_t now; -struct tm *tm; - -time (&now); - tm =localtime (&now); -fprintf (stderr,"%s[%d] %04d-%02d-%02d %02d:%02d:%02d " , - log_name, log_pid, - tm->tm_year+1900 , tm->tm_mon +1 , tm->tm_mday, - tm->tm_hour, tm->tm_min, tm->tm_sec); -#else -fprintf (stderr,"%s: " , log_name); -#endif -vfprintf (stderr, fmt, args2); -fprintf (stderr,"\n" ); -va_end (args2); - } -if (kind ==L_FATAL )exit (1 ); }
Signature · 1 line
2.26.2
PATCH 6/11 nfsdcld: Add graceful exit handling and resource cleanup
In reply to Doug Nazar--- utils/nfsdcld/nfsdcld.c | 32 ++++++++++++++++++++++++++++++-- utils/nfsdcld/sqlite.c | 15 +++++++++++++++ utils/nfsdcld/sqlite.h | 1 + 3 files changed, 46 insertions(+), 2 deletions(-)
utils/nfsdcld/nfsdcld.c +30 -2
@@ -27,6 +27,7 @@#include <event2/event.h> #include <stdbool.h> #include <getopt.h> +#include <signal.h> #include <string.h> #include <sys/stat.h> #include <sys/types.h>
@@ -69,6 +70,7 @@ static int inotify_fd = -1;static struct event *pipedir_event;static struct event_base *evbase;static bool old_kernel = false; +static bool signal_received = false;uint64_t current_epoch;uint64_t recovery_epoch;
@@ -89,6 +91,19 @@ static struct option longopts[] =/* forward declarations */ static void cldcb (int UNUSED (fd ),short which,void *data); +static void +sig_die (int signal) +{ +if (signal_received) { +xlog (D_GENERAL ,"forced exiting on signal %d\n" , signal); +exit (0 ); + } + + signal_received = true; +xlog (D_GENERAL ,"exiting on signal %d\n" , signal); +event_base_loopexit (evbase,NULL ); +} +static void usage (char *progname) {
@@ -881,14 +896,27 @@ main(int argc, char **argv)if (rc) goto out; +signal (SIGINT , sig_die); +signal (SIGTERM , sig_die); +xlog (D_GENERAL ,"%s: Starting event dispatch handler." , __func__); rc =event_base_dispatch (evbase);if (rc <0 )xlog (L_ERROR ,"%s: event_dispatch failed: %m" , __func__); -close (clnt.cl_fd); -close (inotify_fd); out: +if (clnt.cl_event) +event_free (clnt.cl_event); +if (clnt.cl_fd !=-1 ) +close (clnt.cl_fd); +if (pipedir_event) +event_free (pipedir_event); +if (inotify_fd !=-1 ) +close (inotify_fd); + +event_base_free (evbase); +sqlite_shutdown (); +free (progname);return rc; }
utils/nfsdcld/sqlite.c +15 -0
@@ -1404,3 +1404,18 @@ sqlite_first_time_done(void)sqlite3_free (err);return ret; } + +/* +* Closes all sqlite3 resources and shuts down the library. +* +*/ +void +sqlite_shutdown (void ) +{ +if (dbh !=NULL ) { +sqlite3_close (dbh); + dbh =NULL ; + } + +sqlite3_shutdown (); +}
utils/nfsdcld/sqlite.h +1 -0
@@ -34,4 +34,5 @@ int sqlite_iterate_recovery(int (*cb)(struct cld_client *clnt), struct cld_clienint sqlite_delete_cltrack_records (void );int sqlite_first_time_done (void ); +void sqlite_shutdown (void );#endif /* _SQLITE_H */
Signature · 1 line
2.26.2
PATCH 7/11 nfsdcld: Don't copy more data than exists in column
In reply to Doug NazarFound with valgrind.
--- utils/nfsdcld/sqlite.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
utils/nfsdcld/sqlite.c +12 -6
@@ -1330,20 +1330,26 @@ sqlite_iterate_recovery(int (*cb)(struct cld_client *clnt), struct cld_client *c }while ((ret =sqlite3_step (stmt)) ==SQLITE_ROW ) { +const void *id; +int id_len; + + id =sqlite3_column_blob (stmt,0 ); + id_len =sqlite3_column_bytes (stmt,0 ); +if (id_len >NFS4_OPAQUE_LIMIT ) + id_len =NFS4_OPAQUE_LIMIT ; +memset (&cmsg->cm_u,0 ,sizeof (cmsg->cm_u));#if UPCALL_VERSION >=2 -memcpy (&cmsg->cm_u.cm_clntinfo.cc_name.cn_id, -sqlite3_column_blob (stmt,0 ),NFS4_OPAQUE_LIMIT ); - cmsg->cm_u.cm_clntinfo.cc_name.cn_len =sqlite3_column_bytes (stmt,0 ); +memcpy (&cmsg->cm_u.cm_clntinfo.cc_name.cn_id, id, id_len); + cmsg->cm_u.cm_clntinfo.cc_name.cn_len = id_len;if (sqlite3_column_bytes (stmt,1 ) >0 ) {memcpy (&cmsg->cm_u.cm_clntinfo.cc_princhash.cp_data,sqlite3_column_blob (stmt,1 ),SHA256_DIGEST_SIZE ); cmsg->cm_u.cm_clntinfo.cc_princhash.cp_len =sqlite3_column_bytes (stmt,1 ); }#else -memcpy (&cmsg->cm_u.cm_name.cn_id,sqlite3_column_blob (stmt,0 ), -NFS4_OPAQUE_LIMIT ); - cmsg->cm_u.cm_name.cn_len =sqlite3_column_bytes (stmt,0 ); +memcpy (&cmsg->cm_u.cm_name.cn_id, id, id_len); + cmsg->cm_u.cm_name.cn_len = id_len;#endif cb (clnt); }
Signature · 1 line
2.26.2
PATCH 8/11 svcgssd: Convert to using libevent
In reply to Doug Nazar--- utils/gssd/Makefile.am | 2 +- utils/gssd/svcgssd.c | 72 ++++++++++++++++++++++++-- utils/gssd/svcgssd.h | 3 +- utils/gssd/svcgssd_main_loop.c | 94 ---------------------------------- utils/gssd/svcgssd_proc.c | 15 +----- 5 files changed, 70 insertions(+), 116 deletions(-) delete mode 100644 utils/gssd/svcgssd_main_loop.c
utils/gssd/Makefile.am +1 -1
@@ -67,7 +67,6 @@ gssd_CFLAGS = \ svcgssd_SOURCES = \ $(COMMON_SRCS) \ svcgssd.c \ - svcgssd_main_loop.c \ svcgssd_mech2file.c \ svcgssd_proc.c \ svcgssd_krb5.c \
@@ -78,6 +77,7 @@ svcgssd_SOURCES = \ svcgssd_LDADD = \ ../../support/nfs/libnfs.la \ ../../support/nfsidmap/libnfsidmap.la \ + $(LIBEVENT) \ $(RPCSECGSS_LIBS) \ $(KRBLIBS) $(GSSAPI_LIBS) $(LIBTIRPC)
utils/gssd/svcgssd.c +67 -5
115 lines not on this page · raw message
utils/gssd/svcgssd.h +1 -2
@@ -35,8 +35,7 @@#include <sys/queue.h> #include <gssapi/gssapi.h> -void handle_nullreq (int f); -void gssd_run (void ); +void handle_nullreq (char *cp);#define GSSD_SERVICE_NAME "nfs"
utils/gssd/svcgssd_main_loop.c deleted +0 -94
94 lines not on this page · raw message
utils/gssd/svcgssd_proc.c +1 -14
@@ -318,7 +318,7 @@ print_hexl(const char *description, unsigned char *cp, int length)#endif void -handle_nullreq (int f) { +handle_nullreq (char *cp) {/* XXX initialize to a random integer to reduce chances of unnecessary * invalidation of existing ctx's on restarting svcgssd. */ static u_int32_t handle_seq =0 ;
@@ -340,24 +340,11 @@ handle_nullreq(int f) {u_int32_t maj_stat =GSS_S_FAILURE , min_stat =0 ;u_int32_t ignore_min_stat;struct svc_cred cred; -char lbuf[RPC_CHAN_BUF_SIZE ]; -int lbuflen =0 ; -char *cp;int32_t ctx_endtime;char *hostbased_name =NULL ;printerr (1 ,"handling null request\n" ); - lbuflen =read (f, lbuf,sizeof (lbuf)); -if (lbuflen <=0 || lbuf[lbuflen-1 ] !='\n' ) { -printerr (0 ,"WARNING: handle_nullreq: " -"failed reading request\n" ); -return ; - } - lbuf[lbuflen-1 ] =0 ; - - cp = lbuf; - in_handle.length = (size_t )qword_get (&cp, in_handle.value,sizeof (in_handle_buf));#ifdef DEBUG
Signature · 1 line
2.26.2
PATCH 9/11 nfsidmap: Add support to cleanup resources on exit
In reply to Doug Nazar--- support/nfsidmap/libnfsidmap.c | 13 +++++++++++++ support/nfsidmap/nfsidmap.h | 1 + support/nfsidmap/nfsidmap_common.c | 11 ++++++++++- support/nfsidmap/nfsidmap_private.h | 1 + support/nfsidmap/nss.c | 8 ++++++++ 5 files changed, 33 insertions(+), 1 deletion(-)
support/nfsidmap/libnfsidmap.c +13 -0
@@ -496,6 +496,19 @@ out:return ret ? -ENOENT :0 ; } +void nfs4_term_name_mapping (void ) +{ +if (nfs4_plugins) +unload_plugins (nfs4_plugins); +if (gss_plugins) +unload_plugins (gss_plugins); + + nfs4_plugins = gss_plugins =NULL ; + +free_local_realms (); +conf_cleanup (); +} +int nfs4_get_default_domain (char *UNUSED (server ),char *domain,size_t len) {
support/nfsidmap/nfsidmap.h +1 -0
@@ -50,6 +50,7 @@ typedef struct _extra_mapping_params {typedef void (*nfs4_idmap_log_function_t )(const char *, ...);int nfs4_init_name_mapping (char *conffile); +void nfs4_term_name_mapping (void );int nfs4_get_default_domain (char *server,char *domain,size_t len);int nfs4_uid_to_name (uid_t uid,char *domain,char *name,size_t len);int nfs4_gid_to_name (gid_t gid,char *domain,char *name,size_t len);
support/nfsidmap/nfsidmap_common.c +10 -1
@@ -34,12 +34,21 @@ static char * toupper_str(char *s)return s; } +static struct conf_list *local_realms =NULL ; + +void free_local_realms (void ) +{ +if (local_realms) { +conf_free_list (local_realms); + local_realms =NULL ; + } +} +/* Get list of "local equivalent" realms. Meaning the list of realms * where [email protected] is considered the same user as [email protected] * If not specified, default to upper-case of local domain name */ struct conf_list *get_local_realms (void ) { -static struct conf_list *local_realms =NULL ;if (local_realms)return local_realms; local_realms =conf_get_list ("General" ,"Local-Realms" );
support/nfsidmap/nfsidmap_private.h +1 -0
@@ -37,6 +37,7 @@#include "conffile.h" struct conf_list *get_local_realms (void ); +void free_local_realms (void );int get_nostrip (void );int get_reformat_group (void );
support/nfsidmap/nss.c +8 -0
@@ -467,6 +467,14 @@ static int nss_plugin_init(void)return 0 ; } +__attribute__((destructor)) +static int nss_plugin_term (void ) +{ +free_local_realms (); +conf_cleanup (); +return 0 ; +} +struct trans_func nss_trans = { .name ="nsswitch" ,
Signature · 1 line
2.26.2
Re: [PATCH 09/11] nfsidmap: Add support to cleanup resources on exit
Hey,
Quoted 90 lines · Doug Nazar
Signed-off-by Doug Nazar <[email protected]>--- support/nfsidmap/libnfsidmap.c | 13 +++++++++++++ support/nfsidmap/nfsidmap.h | 1 + support/nfsidmap/nfsidmap_common.c | 11 ++++++++++- support/nfsidmap/nfsidmap_private.h | 1 + support/nfsidmap/nss.c | 8 ++++++++ 5 files changed, 33 insertions(+), 1 deletion(-)support/nfsidmap/libnfsidmap.c +13
-0@@ -496,6 +496,19 @@ out:return ret ? -ENOENT :0 ; } +void nfs4_term_name_mapping (void ) +{ +if (nfs4_plugins) +unload_plugins (nfs4_plugins); +if (gss_plugins) +unload_plugins (gss_plugins); + + nfs4_plugins = gss_plugins =NULL ; + +free_local_realms (); +conf_cleanup (); +} +int nfs4_get_default_domain (char *UNUSED (server ),char *domain,size_t len) {support/nfsidmap/nfsidmap.h +1
-0@@ -50,6 +50,7 @@ typedef struct _extra_mapping_params {typedef void (*nfs4_idmap_log_function_t )(const char *, ...);int nfs4_init_name_mapping (char *conffile); +void nfs4_term_name_mapping (void );int nfs4_get_default_domain (char *server,char *domain,size_t len);int nfs4_uid_to_name (uid_t uid,char *domain,char *name,size_t len);int nfs4_gid_to_name (gid_t gid,char *domain,char *name,size_t len);support/nfsidmap/nfsidmap_common.c +10
-1@@ -34,12 +34,21 @@ static char * toupper_str(char *s)return s; } +static struct conf_list *local_realms =NULL ; + +void free_local_realms (void ) +{ +if (local_realms) { +conf_free_list (local_realms); + local_realms =NULL ; + } +} +/* Get list of "local equivalent" realms. Meaning the list of realms * where [email protected] is considered the same user as [email protected] * If not specified, default to upper-case of local domain name */ struct conf_list *get_local_realms (void ) { -static struct conf_list *local_realms =NULL ;if (local_realms)return local_realms; local_realms =conf_get_list ("General" ,"Local-Realms" );support/nfsidmap/nfsidmap_private.h +1
-0@@ -37,6 +37,7 @@#include "conffile.h" struct conf_list *get_local_realms (void ); +void free_local_realms (void );int get_nostrip (void );int get_reformat_group (void );support/nfsidmap/nss.c +0
-0@@ -467,6 +467,14 @@ static int nss_plugin_init(void)return 0 ;
support/nfsidmap/nss.c static int nss_plugin_init(void) · line 477
Quoted 10 lines
support/nfsidmap/nss.c +8
-0} +__attribute__((destructor)) +static int nss_plugin_term (void ) +{ +free_local_realms (); +conf_cleanup (); +return 0 ; +} +
Just wondering... How is nss_plugin_term() called/used?
steved.
Quoted 4 lines
support/nfsidmap/nss.c +0
-0struct trans_func nss_trans = { .name ="nsswitch" ,
Re: [PATCH 09/11] nfsidmap: Add support to cleanup resources on exit
Quoted 10 lines · Steve Dickson
support/nfsidmap/nss.c static int nss_plugin_init(void) · line 477
Quoted 9 lines
support/nfsidmap/nss.c +8
-0+__attribute__((destructor)) +static int nss_plugin_term (void ) +{ +free_local_realms (); +conf_cleanup (); +return 0 ; +} +Just wondering... How is
nss_plugin_term()called/used?
Automatically during dlclose(), see the 'Initialization and finalization functions' section of the man page. I'd originally thought to extend trans_func but didn't see an easy way to extend the api (no size or version field) without breaking any possible out of tree plugins (do they exist?).
Doug
Re: [PATCH 09/11] nfsidmap: Add support to cleanup resources on exit
Quoted 12 lines · Doug Nazar
Quoted 10 lines · Steve Dickson
support/nfsidmap/nss.c static int nss_plugin_init(void) · line 477
Quoted 9 lines
support/nfsidmap/nss.c +8
-0+__attribute__((destructor)) +static int nss_plugin_term (void ) +{ + free_local_realms(); + conf_cleanup(); + return 0; +} +Just wondering... How is
nss_plugin_term()called/used?
Quoted 1 line
Automatically during
dlclose(), see the 'Initialization and finalization functions' section of the man page. I'd originally thought to extendtrans_funcbut didn't see an easy way to extend the api (no size or version field) without breaking any possible out of tree plugins (do they exist?).
Interesting... I think I'll add a comment explaining it...
No..they do not exist.. The way you are going is fine... Less churn is good ;-)
steved.
PATCH 10/11 svcgssd: Cleanup global resources on exit
In reply to Doug Nazar--- utils/gssd/gss_util.c | 6 ++++++ utils/gssd/gss_util.h | 1 + utils/gssd/svcgssd.c | 8 ++++++++ utils/gssd/svcgssd_krb5.c | 21 ++++++++++++++------- utils/gssd/svcgssd_krb5.h | 1 + 5 files changed, 30 insertions(+), 7 deletions(-)
utils/gssd/gss_util.c +6 -0
@@ -339,3 +339,9 @@ out:return retval; } +void +gssd_cleanup (void ) +{ +u_int32_t min_stat; +gss_release_cred (&min_stat, &gssd_creds); +}
utils/gssd/gss_util.h +1 -0
@@ -41,6 +41,7 @@ int gssd_acquire_cred(char *server_name, const gss_OID oid);void pgsserr (char *msg,u_int32_t maj_stat,u_int32_t min_stat,const gss_OID mech);int gssd_check_mechs (void ); +void gssd_cleanup (void );#ifndef HAVE_LIBGSSGLUE #include <gssapi/gssapi_krb5.h>
utils/gssd/svcgssd.c +8 -0
@@ -65,6 +65,7 @@#include "err_util.h" #include "conffile.h" #include "misc.h" +#include "svcgssd_krb5.h" struct state_paths etab;static bool signal_received = false;
@@ -148,6 +149,9 @@ main(int argc, char *argv[]) rpc_verbosity =conf_get_num ("svcgssd" ,"RPC-Verbosity" , rpc_verbosity); idmap_verbosity =conf_get_num ("svcgssd" ,"IDMAP-Verbosity" , idmap_verbosity); +/* We don't need the config anymore */ +conf_cleanup (); +while ((opt =getopt (argc, argv,"fivrnp:" )) !=-1 ) {switch (opt) {case 'f' :
@@ -276,5 +280,9 @@ main(int argc, char *argv[])event_base_free (evbase); +nfs4_term_name_mapping (); +svcgssd_free_enctypes (); +gssd_cleanup (); +return EXIT_SUCCESS ; }
utils/gssd/svcgssd_krb5.c +14 -7
@@ -74,13 +74,7 @@ parse_enctypes(char *enctypes)return 0 ;/* Free any existing cached_enctypes */ -free (cached_enctypes); - -if (parsed_enctypes !=NULL ) { -free (parsed_enctypes); - parsed_enctypes =NULL ; - parsed_num_enctypes =0 ; - } +svcgssd_free_enctypes ();/* count the number of commas */ for (curr = enctypes; curr && *curr !='\0' ; curr = ++comma) {
@@ -162,6 +156,19 @@ out_clean_parsed:/*=== External routines ===*/ /*==========================*/ +void +svcgssd_free_enctypes (void ) +{ +free (cached_enctypes); + cached_enctypes =NULL ; + +if (parsed_enctypes !=NULL ) { +free (parsed_enctypes); + parsed_enctypes =NULL ; + parsed_num_enctypes =0 ; + } +} +/* * Get encryption types supported by the kernel, and then * call gss_krb5_set_allowable_enctypes() to limit the
utils/gssd/svcgssd_krb5.h +1 -0
@@ -32,5 +32,6 @@#define SVCGSSD_KRB5_H int svcgssd_limit_krb5_enctypes (void ); +void svcgssd_free_enctypes (void );#endif /* SVCGSSD_KRB5_H */
Signature · 1 line
2.26.2
PATCH 11/11 svcgssd: Wait for nullrpc channel if not available
In reply to Doug Nazar--- utils/gssd/svcgssd.c | 99 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 80 insertions(+), 19 deletions(-)
utils/gssd/svcgssd.c +80 -19
@@ -67,9 +67,14 @@#include "misc.h" #include "svcgssd_krb5.h" -struct state_paths etab; +struct state_paths etab;/* from cacheio.c */ static bool signal_received = false;static struct event_base *evbase =NULL ; +static int nullrpc_fd =-1 ; +static struct event *nullrpc_event =NULL ; +static struct event *wait_event =NULL ; + +#define NULLRPC_FILE "/proc/net/rpc/auth.rpcsec.init/channel"static void sig_die (int signal)
@@ -118,6 +123,66 @@ svcgssd_nullrpc_cb(int fd, short UNUSED(which), void *UNUSED(data))handle_nullreq (lbuf); } +static void +svcgssd_nullrpc_close (void ) +{ +if (nullrpc_event) { +printerr (2 ,"closing nullrpc channel %s\n" ,NULLRPC_FILE ); +event_free (nullrpc_event); + nullrpc_event =NULL ; + } +if (nullrpc_fd !=-1 ) { +close (nullrpc_fd); + nullrpc_fd =-1 ; + } +} + +static void +svcgssd_nullrpc_open (void ) +{ + nullrpc_fd =open (NULLRPC_FILE ,O_RDWR ); +if (nullrpc_fd <0 ) { +printerr (0 ,"failed to open %s: %s\n" , +NULLRPC_FILE ,strerror (errno)); +return ; + } + nullrpc_event =event_new (evbase, nullrpc_fd,EV_READ |EV_PERSIST , + svcgssd_nullrpc_cb,NULL ); +if (!nullrpc_event) { +printerr (0 ,"failed to create event for %s: %s\n" , +NULLRPC_FILE ,strerror (errno)); +close (nullrpc_fd); + nullrpc_fd =-1 ; +return ; + } +event_add (nullrpc_event,NULL ); +printerr (2 ,"opened nullrpc channel %s\n" ,NULLRPC_FILE ); +} + +static void +svcgssd_wait_cb (int UNUSED (fd ),short UNUSED (which ),void *UNUSED (data )) +{ +static int times =0 ; +int rc; + + rc =access (NULLRPC_FILE ,R_OK |W_OK ); +if (rc !=0 ) { +struct timeval t = {times <10 ?1 :10 ,0 }; + times++; +if (times %30 ==0 ) +printerr (2 ,"still waiting for nullrpc channel: %s\n" , +NULLRPC_FILE ); +evtimer_add (wait_event, &t); +return ; + } + +svcgssd_nullrpc_open (); +event_free (wait_event); + wait_event =NULL ; +} + + +int main (int argc,char *argv[]) {
@@ -132,8 +197,6 @@ main(int argc, char *argv[])char *principal =NULL ;char *s;int rc; -int nullrpc_fd =-1 ; -struct event *nullrpc_event =NULL ;conf_init_file (NFS_CONFFILE );
@@ -250,22 +313,19 @@ main(int argc, char *argv[]) } } -#define NULLRPC_FILE "/proc/net/rpc/auth.rpcsec.init/channel" - - nullrpc_fd =open (NULLRPC_FILE ,O_RDWR ); -if (nullrpc_fd <0 ) { -printerr (0 ,"failed to open %s: %s\n" , -NULLRPC_FILE ,strerror (errno)); -exit (1 ); - } - nullrpc_event =event_new (evbase, nullrpc_fd,EV_READ |EV_PERSIST , - svcgssd_nullrpc_cb,NULL ); +svcgssd_nullrpc_open ();if (!nullrpc_event) { -printerr (0 ,"failed to create event for %s: %s\n" , -NULLRPC_FILE ,strerror (errno)); -exit (1 ); +struct timeval t = {1 ,0 }; + +printerr (2 ,"waiting for nullrpc channel to appear\n" ); + wait_event =evtimer_new (evbase, svcgssd_wait_cb,NULL ); +if (!wait_event) { +printerr (0 ,"ERROR: failed to create wait event: %s\n" , +strerror (errno)); +exit (EXIT_FAILURE ); + } +evtimer_add (wait_event, &t); } -event_add (nullrpc_event,NULL );daemon_ready ();
@@ -275,8 +335,9 @@ main(int argc, char *argv[])if (rc <0 )printerr (0 ,"event_base_dispatch() returned %i!\n" , rc); -event_free (nullrpc_event); -close (nullrpc_fd); +svcgssd_nullrpc_close (); +if (wait_event) +event_free (wait_event);event_base_free (evbase);
Signature · 1 line
2.26.2
Re: [PATCH 11/11] svcgssd: Wait for nullrpc channel if not available
Quoted 1 line · Doug Nazar
Signed-off-by Doug Nazar <[email protected]>
So, is there a race here that could result in a hang, and has anyone seen it in practice?
Just curious. Thanks for doing this.--b.
Quoted 148 lines
--- utils/gssd/svcgssd.c | 99 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 80 insertions(+), 19 deletions(-)utils/gssd/svcgssd.c +80
-19@@ -67,9 +67,14 @@#include "misc.h" #include "svcgssd_krb5.h" -struct state_paths etab; +struct state_paths etab;/* from cacheio.c */ static bool signal_received = false;static struct event_base *evbase =NULL ; +static int nullrpc_fd =-1 ; +static struct event *nullrpc_event =NULL ; +static struct event *wait_event =NULL ; + +#define NULLRPC_FILE "/proc/net/rpc/auth.rpcsec.init/channel"static void sig_die (int signal)@@ -118,6 +123,66 @@ svcgssd_nullrpc_cb(int fd, short UNUSED(which), void *UNUSED(data))handle_nullreq (lbuf); } +static void +svcgssd_nullrpc_close (void ) +{ +if (nullrpc_event) { +printerr (2 ,"closing nullrpc channel %s\n" ,NULLRPC_FILE ); +event_free (nullrpc_event); + nullrpc_event =NULL ; + } +if (nullrpc_fd !=-1 ) { +close (nullrpc_fd); + nullrpc_fd =-1 ; + } +} + +static void +svcgssd_nullrpc_open (void ) +{ + nullrpc_fd =open (NULLRPC_FILE ,O_RDWR ); +if (nullrpc_fd <0 ) { +printerr (0 ,"failed to open %s: %s\n" , +NULLRPC_FILE ,strerror (errno)); +return ; + } + nullrpc_event =event_new (evbase, nullrpc_fd,EV_READ |EV_PERSIST , + svcgssd_nullrpc_cb,NULL ); +if (!nullrpc_event) { +printerr (0 ,"failed to create event for %s: %s\n" , +NULLRPC_FILE ,strerror (errno)); +close (nullrpc_fd); + nullrpc_fd =-1 ; +return ; + } +event_add (nullrpc_event,NULL ); +printerr (2 ,"opened nullrpc channel %s\n" ,NULLRPC_FILE ); +} + +static void +svcgssd_wait_cb (int UNUSED (fd ),short UNUSED (which ),void *UNUSED (data )) +{ +static int times =0 ; +int rc; + + rc =access (NULLRPC_FILE ,R_OK |W_OK ); +if (rc !=0 ) { +struct timeval t = {times <10 ?1 :10 ,0 }; + times++; +if (times %30 ==0 ) +printerr (2 ,"still waiting for nullrpc channel: %s\n" , +NULLRPC_FILE ); +evtimer_add (wait_event, &t); +return ; + } + +svcgssd_nullrpc_open (); +event_free (wait_event); + wait_event =NULL ; +} + + +int main (int argc,char *argv[]) {@@ -132,8 +197,6 @@ main(int argc, char *argv[])char *principal =NULL ;char *s;int rc; -int nullrpc_fd =-1 ; -struct event *nullrpc_event =NULL ;conf_init_file (NFS_CONFFILE );@@ -250,22 +313,19 @@ main(int argc, char *argv[]) } } -#define NULLRPC_FILE "/proc/net/rpc/auth.rpcsec.init/channel" - - nullrpc_fd =open (NULLRPC_FILE ,O_RDWR ); -if (nullrpc_fd <0 ) { -printerr (0 ,"failed to open %s: %s\n" , -NULLRPC_FILE ,strerror (errno)); -exit (1 ); - } - nullrpc_event =event_new (evbase, nullrpc_fd,EV_READ |EV_PERSIST , - svcgssd_nullrpc_cb,NULL ); +svcgssd_nullrpc_open ();if (!nullrpc_event) { -printerr (0 ,"failed to create event for %s: %s\n" , -NULLRPC_FILE ,strerror (errno)); -exit (1 ); +struct timeval t = {1 ,0 }; + +printerr (2 ,"waiting for nullrpc channel to appear\n" ); + wait_event =evtimer_new (evbase, svcgssd_wait_cb,NULL ); +if (!wait_event) { +printerr (0 ,"ERROR: failed to create wait event: %s\n" , +strerror (errno)); +exit (EXIT_FAILURE ); + } +evtimer_add (wait_event, &t); } -event_add (nullrpc_event,NULL );daemon_ready ();@@ -275,8 +335,9 @@ main(int argc, char *argv[])if (rc <0 )printerr (0 ,"event_base_dispatch() returned %i!\n" , rc); -event_free (nullrpc_event); -close (nullrpc_fd); +svcgssd_nullrpc_close (); +if (wait_event) +event_free (wait_event);event_base_free (evbase);Signature · 1 line
2.26.2
Re: [PATCH 11/11] svcgssd: Wait for nullrpc channel if not available
Quoted 4 lines · J. Bruce Fields
So, is there a race here that could result in a hang, and has anyone seen it in practice?
Just curious. Thanks for doing this.--b.
Not a hang, with the existing code, svcgssd will just exit. I'd have to go and restart it after boot. I'm assuming a systemd setup would just restart it automatically. On my original systems I'd configured it to force load the modules, but I'd forgotten about that (it was about 10 years ago) when I built this new box last month.
As mentioned in the other email, sunrpc is loaded from an initramfs that doesn't have any of the gss modules. When nfsd is started (after svcgssd) it'll then load the gss modules but by then it's too late.
It seems to be a standard Gentoo setup. I just checked the default kernel config for genkernel (their kernel & initramfs builder) and it has all the rpc & nfs as modules, with the initramfs not supporting Kerberos.
Looks like Debian modprobes rpcsec_gss_krb5 before starting rpc.svcgssd.
So with this waiting for the file to appear, and I'm planning on adding a conditional module load to the Gentoo rpc.svcgssd init script, things should be as bulletproof as I can make it.
Doug
Quoted 9 lines · Doug Nazar
Again, here are various cleanups and fixes. Nothing too major, although a couple valgrind finds.
I've left out the printf patch for now, pending further discussion.
Thanks,
Doug
Quoted 12 lines
Doug Nazar (11):
Add error handling to libevent allocations.
gssd: Fix cccache buffer size
gssd: Fix handling of failed allocations
gssd: srchost should never be *
xlog: Reorganizexlog_backend()to work around -Wmaybe-uninitialized
nfsdcld: Add graceful exit handling and resource cleanup
nfsdcld: Don't copy more data than exists in column
svcgssd: Convert to using libevent
nfsidmap: Add support to cleanup resources on exit
svcgssd: Cleanup global resources on exit
svcgssd: Wait for nullrpc channel if not available
Series committed... (tag: nfs-utils-2-5-2-rc3)
steved.
Quoted 26 lines
support/nfs/xlog.c | 41 ++++---- support/nfsidmap/libnfsidmap.c | 13 +++ support/nfsidmap/nfsidmap.h | 1 + support/nfsidmap/nfsidmap_common.c | 11 ++- support/nfsidmap/nfsidmap_private.h | 1 + support/nfsidmap/nss.c | 8 ++ utils/gssd/Makefile.am | 2 +- utils/gssd/gss_names.c | 6 +- utils/gssd/gss_util.c | 6 ++ utils/gssd/gss_util.h | 1 + utils/gssd/gssd.c | 37 +++++-- utils/gssd/krb5_util.c | 12 +-- utils/gssd/svcgssd.c | 143 ++++++++++++++++++++++++++-- utils/gssd/svcgssd.h | 3 +- utils/gssd/svcgssd_krb5.c | 21 ++-- utils/gssd/svcgssd_krb5.h | 1 + utils/gssd/svcgssd_main_loop.c | 94 ------------------ utils/gssd/svcgssd_proc.c | 15 +-- utils/idmapd/idmapd.c | 32 +++++++ utils/nfsdcld/nfsdcld.c | 50 +++++++++- utils/nfsdcld/sqlite.c | 33 +++++-- utils/nfsdcld/sqlite.h | 1 + 22 files changed, 358 insertions(+), 174 deletions(-) delete mode 100644 utils/gssd/svcgssd_main_loop.c