Update.

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.

diff --git a/ChangeLog b/ChangeLog
index 7b1ad3b1fe4b760b43ae0d9a68fb067bea85bcf3..92bc160e769d2efec2f17af90ae0d38c29684ee1 100644 (file)
--- 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 51896974e5a4de5e8ad3563a92b0f512333df573..b9de1612c323826a71d85fa10f324c4c48a351fc 100644 (file)
--- 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 53e745ef5b054944fe15ec26066668b02335c70e..524d9b56bc488f203a3ce608b9ce9eee5b2e0dc2 100644 (file)
--- 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 ee4a6e04b5c175c51745d2924048d58e727f7d1a..7e8ac9e2719b68eab2c35440e216826d4555cae2 100644 (file)
--- 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 8c2f3f1489beb60ea1446226c16e36e7cf9e5012..4e0496ff44be0d3ac9f1ca23a916d9be2962ff90 100644 (file)
--- 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 d9d9139991b0c1fa45d98f69cf360fe7d19f6e31..c565f5a68278232252b079c19ffd901ee6dee61f 100644 (file)
--- 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 d001e6526c5ad713ab9098febcc9e8a7525e8f5f..99d2998f49b9534f064fe6829ddc064a3dabce60 100644 (file)
--- 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 51aed02c54ebb36b75deeefb35b124948bae793d..4586cf04c9ac8fdf4e1b75a9df959164a5e439db 100644 (file)
--- 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 bfc9ec0e07c8b5f6745fa6c9499c6eaf6ab13d96..e8b9578778dbf06bc3d2cd473ec366fd953aa22d 100644 (file)
--- 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);