mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 10:50:07 +00:00
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.
This commit is contained in:
parent
65f0beb9c5
commit
3c12b91ade
@ -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
|
||||
|
@ -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;
|
||||
|
@ -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.
|
||||
|
@ -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 {
|
||||
|
@ -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)
|
||||
{
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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:
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user