diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | linuxthreads/Versions | 6 | ||||
| -rw-r--r-- | nptl/ChangeLog | 1 | ||||
| -rw-r--r-- | nptl/Versions | 5 | ||||
| -rw-r--r-- | nscd/aicache.c | 6 | ||||
| -rw-r--r-- | nscd/grpcache.c | 6 | ||||
| -rw-r--r-- | nscd/hstcache.c | 6 | ||||
| -rw-r--r-- | nscd/nscd.c | 7 | ||||
| -rw-r--r-- | nscd/pwdcache.c | 6 |
9 files changed, 36 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog index 7b1ad3b1fe..92bc160e76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-09-20 Ulrich Drepper <drepper@redhat.com> + + * nscd/nscd.c (options): Mark S option as hidden. + (parse_opt): When S option is used, print warning message. + * nscd/grpcache.c (adgrptbyX): Don't handle secure mode. + * nscd/hstcache.c (addhstbyX): Don't handle secure mode. + * nscd/aicache.c (addhstaiX): Don't handle secure mode. + * nscd/pwdcache.c (addpwbyX): Don't handle secure mode. + 2004-09-20 Roland McGrath <roland@frob.com> * elf/dl-load.c (__stack_prot): Only use PROT_GROWSUP/PROT_GROWSDOWN diff --git a/linuxthreads/Versions b/linuxthreads/Versions index 51896974e5..b9de1612c3 100644 --- a/linuxthreads/Versions +++ b/linuxthreads/Versions @@ -172,12 +172,6 @@ libpthread { pthread_cond_wait; pthread_cond_timedwait; pthread_cond_signal; pthread_cond_broadcast; } - GLIBC_2.3.4 { - pthread_setuid_np; pthread_seteuid_np; pthread_setreuid_np; - pthread_setresuid_np; - pthread_setgid_np; pthread_setegid_np; pthread_setregid_np; - pthread_setresgid_np; - } GLIBC_PRIVATE { # Internal libc interface to libpthread __pthread_initialize; diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 53e745ef5b..524d9b56bc 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,5 +1,6 @@ 2004-09-20 Ulrich Drepper <drepper@redhat.com> + * Versions: Remove exports for pthread_set*id_np functions. * sysdeps/pthread/pthread.h: Remove pthread_set*id_np prototypes for now. * Makefile: Don't build pthread_set*id code for now. diff --git a/nptl/Versions b/nptl/Versions index ee4a6e04b5..7e8ac9e271 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -228,11 +228,6 @@ libpthread { # New affinity interfaces. pthread_getaffinity_np; pthread_setaffinity_np; pthread_attr_getaffinity_np; pthread_attr_setaffinity_np; - - pthread_setuid_np; pthread_seteuid_np; pthread_setreuid_np; - pthread_setresuid_np; - pthread_setgid_np; pthread_setegid_np; pthread_setregid_np; - pthread_setresgid_np; } GLIBC_PRIVATE { diff --git a/nscd/aicache.c b/nscd/aicache.c index 8c2f3f1489..4e0496ff44 100644 --- a/nscd/aicache.c +++ b/nscd/aicache.c @@ -58,7 +58,6 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req, look again in the table whether the dataset is now available. We simply insert it. It does not matter if it is in there twice. The pruning function only will look at the timestamp. */ - uid_t oldeuid = 0; /* We allocate all data in one memory block: the iov vector, the response header and the dataset itself. */ @@ -77,11 +76,14 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req, dbg_log (_("Reloading \"%s\" in hosts cache!"), (char *) key); } +#if 0 + uid_t oldeuid = 0; if (db->secure) { oldeuid = geteuid (); pthread_seteuid_np (uid); } +#endif static service_user *hosts_database; service_user *nip = NULL; @@ -425,8 +427,10 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req, out: _res.options = old_res_options; +#if 0 if (db->secure) pthread_seteuid_np (oldeuid); +#endif if (dataset != NULL && !alloca_used) { diff --git a/nscd/grpcache.c b/nscd/grpcache.c index d9d9139991..c565f5a682 100644 --- a/nscd/grpcache.c +++ b/nscd/grpcache.c @@ -404,7 +404,6 @@ addgrbyX (struct database_dyn *db, int fd, request_header *req, char *buffer = (char *) alloca (buflen); struct group resultbuf; struct group *grp; - uid_t oldeuid = 0; bool use_malloc = false; int errval = 0; @@ -416,11 +415,14 @@ addgrbyX (struct database_dyn *db, int fd, request_header *req, dbg_log (_("Reloading \"%s\" in group cache!"), keystr); } +#if 0 + uid_t oldeuid = 0; if (db->secure) { oldeuid = geteuid (); pthread_seteuid_np (uid); } +#endif while (lookup (req->type, key, &resultbuf, buffer, buflen, &grp) != 0 && (errval = errno) == ERANGE) @@ -455,8 +457,10 @@ addgrbyX (struct database_dyn *db, int fd, request_header *req, buffer = (char *) extend_alloca (buffer, buflen, buflen + INCR); } +#if 0 if (db->secure) pthread_seteuid_np (oldeuid); +#endif cache_addgr (db, fd, req, keystr, grp, uid, he, dh, errval); diff --git a/nscd/hstcache.c b/nscd/hstcache.c index d001e6526c..99d2998f49 100644 --- a/nscd/hstcache.c +++ b/nscd/hstcache.c @@ -419,7 +419,6 @@ addhstbyX (struct database_dyn *db, int fd, request_header *req, char *buffer = (char *) alloca (buflen); struct hostent resultbuf; struct hostent *hst; - uid_t oldeuid = 0; bool use_malloc = false; int errval = 0; @@ -439,11 +438,14 @@ addhstbyX (struct database_dyn *db, int fd, request_header *req, dbg_log (_("Reloading \"%s\" in hosts cache!"), (char *) str); } +#if 0 + uid_t oldeuid = 0; if (db->secure) { oldeuid = geteuid (); pthread_seteuid_np (uid); } +#endif while (lookup (req->type, key, &resultbuf, buffer, buflen, &hst) != 0 && h_errno == NETDB_INTERNAL @@ -479,8 +481,10 @@ addhstbyX (struct database_dyn *db, int fd, request_header *req, buffer = (char *) extend_alloca (buffer, buflen, buflen + INCR); } +#if 0 if (db->secure) pthread_seteuid_np (oldeuid); +#endif cache_addhst (db, fd, req, key, hst, uid, he, dh, h_errno == TRY_AGAIN ? errval : 0); diff --git a/nscd/nscd.c b/nscd/nscd.c index 51aed02c54..4586cf04c9 100644 --- a/nscd/nscd.c +++ b/nscd/nscd.c @@ -98,7 +98,8 @@ static const struct argp_option options[] = { "statistic", 'g', NULL, 0, N_("Print current configuration statistic") }, { "invalidate", 'i', N_("TABLE"), 0, N_("Invalidate the specified cache") }, - { "secure", 'S', N_("TABLE,yes"), 0, N_("Use separate cache for each user")}, + { "secure", 'S', N_("TABLE,yes"), OPTION_HIDDEN, + N_("Use separate cache for each user")}, { NULL, 0, NULL, 0, NULL } }; @@ -356,12 +357,16 @@ parse_opt (int key, char *arg, struct argp_state *state) break; case 'S': +#if 0 if (strcmp (arg, "passwd,yes") == 0) secure_in_use = dbs[pwddb].secure = 1; else if (strcmp (arg, "group,yes") == 0) secure_in_use = dbs[grpdb].secure = 1; else if (strcmp (arg, "hosts,yes") == 0) secure_in_use = dbs[hstdb].secure = 1; +#else + error (0, 0, _("secure services not implemented anymore")); +#endif break; default: diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c index bfc9ec0e07..e8b9578778 100644 --- a/nscd/pwdcache.c +++ b/nscd/pwdcache.c @@ -400,7 +400,6 @@ addpwbyX (struct database_dyn *db, int fd, request_header *req, char *buffer = (char *) alloca (buflen); struct passwd resultbuf; struct passwd *pwd; - uid_t oldeuid = 0; bool use_malloc = false; int errval = 0; @@ -412,11 +411,14 @@ addpwbyX (struct database_dyn *db, int fd, request_header *req, dbg_log (_("Reloading \"%s\" in password cache!"), keystr); } +#if 0 + uid_t oldeuid = 0; if (db->secure) { oldeuid = geteuid (); pthread_seteuid_np (c_uid); } +#endif while (lookup (req->type, key, &resultbuf, buffer, buflen, &pwd) != 0 && (errval = errno) == ERANGE) @@ -451,8 +453,10 @@ addpwbyX (struct database_dyn *db, int fd, request_header *req, buffer = (char *) extend_alloca (buffer, buflen, buflen + INCR); } +#if 0 if (db->secure) pthread_seteuid_np (oldeuid); +#endif /* Add the entry to the cache. */ cache_addpw (db, fd, req, keystr, pwd, c_uid, he, dh, errval); |