PERFORCE change 85777 for review
soc-bushman
soc-bushman at FreeBSD.org
Mon Oct 24 06:05:47 PDT 2005
http://perforce.freebsd.org/chv.cgi?CH=85777
Change 85777 by soc-bushman at soc-bushman_stinger on 2005/10/24 13:04:31
release patch preparation stage
Affected files ...
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/Makefile#4 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/Makefile#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.c#2 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.h#2 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/Makefile.inc#5 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.c#2 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.h#2 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.c#5 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.h#5 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.c#5 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.h#5 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.c#5 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.h#5 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.8#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.c#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf.5#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.c#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.h#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.c#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.h#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.c#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.h#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.c#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.h#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/hashtable.h#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.c#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.h#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.c#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.h#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.c#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.h#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.c#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.h#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.c#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.h#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.c#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.h#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.c#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.h#9 edit
.. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/startup/cached#4 edit
.. //depot/projects/soc2005/nsswitch_cached/src/include/pthread.h#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/include/pthread_np.h#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/include/signal.h#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/bsnmpd/Makefile#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/gensnmptree/Makefile#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/Makefile.inc#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/Makefile#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/Makefile#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agent.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agent.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/Makefile.inc#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/group.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/group.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/hosts.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/hosts.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/passwd.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/passwd.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/services.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/services.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.8#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.conf#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.conf.5#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cachelib.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cachelib.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cacheplcs.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cacheplcs.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/config.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/config.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/debug.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/debug.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/hashtable.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/log.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/log.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_rs_query.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_rs_query.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_ws_query.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_ws_query.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/parser.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/parser.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/protocol.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/protocol.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/query.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/query.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/singletons.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/singletons.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/startup/cached#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cdcontrol/cdcontrol.c#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/ipfwpcap/Makefile#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/ipfwpcap/ipfwpcap.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lmcconfig/Makefile#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lmcconfig/lmcconfig.8#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lmcconfig/lmcconfig.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lpr/lpc/lpc.c#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/ndp/ndp.8#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/ndp/ndp.c#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pccard/Makefile.inc#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/delete/main.c#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/info/main.c#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/version/perform.c#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/version/test-pkg_version.sh#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pmcstat/pmcstat.8#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pmcstat/pmcstat.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pmcstat/pmcstat_log.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/powerd/Makefile#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/powerd/powerd.c#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/rtadvd/config.c#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/rtadvd/rtadvd.c#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/setkey/Makefile#2 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/setkey/parse.y#2 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/setkey/sample.cf#2 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/setkey/scriptdump.pl#2 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/setkey/setkey.8#2 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/setkey/setkey.c#2 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/setkey/test-pfkey.c#2 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/setkey/test-policy.c#2 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/setkey/token.l#2 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/setkey/vchar.h#2 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/devices.c#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/syslogd/syslogd.c#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/vipw/vipw.8#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/watchdogd/watchdogd.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/Makefile#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/ndis_events/Makefile#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/ndis_events/ndis_events.8#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/ndis_events/ndis_events.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/wpa_supplicant/Makefile#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/wpa_supplicant/Packet32.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/wpa_supplicant/Packet32.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/wpa_supplicant/ntddndis.h#1 branch
Differences ...
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/Makefile#4 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/Makefile#9 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.c#2 (text+ko) ====
@@ -77,6 +77,7 @@
new_agents_num = at->agents_num + 1;
new_agents = (struct agent **)malloc(sizeof(struct agent *) *
new_agents_num);
+ assert(new_agents != NULL);
memcpy(new_agents, at->agents, at->agents_num * sizeof(struct agent *));
new_agents[new_agents_num - 1] = a;
qsort(new_agents, new_agents_num, sizeof(struct agent *),
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.h#2 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/Makefile.inc#5 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.c#2 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.h#2 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.c#5 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.h#5 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.c#5 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.h#5 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.c#5 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.h#5 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.8#9 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.c#9 (text+ko) ====
@@ -130,8 +130,11 @@
FILE *pidfile;
pidfile = fopen(filename, "w");
- if (pidfile == NULL)
+ if (pidfile == NULL) {
+ LOG_ERR_2("write_pid_file", "can't write to pidfile %s",
+ filename);
return (-1);
+ }
asprintf(&pid_string,"%u",getpid());
assert(pid_string != NULL);
@@ -187,6 +190,7 @@
&config_entry->negative_cache_params);
}
+ LOG_MSG_2("cache", "cache was successfully initialized");
TRACE_OUT(init_cache_);
return (retval);
}
@@ -232,9 +236,13 @@
close(retval->sockfd);
free(retval);
+ LOG_ERR_2("runtime environment", "can't bind socket to path: "
+ "%s", config->socket_path);
TRACE_OUT(init_runtime_env);
return (NULL);
}
+ LOG_MSG_2("runtime environment", "using socket %s",
+ config->socket_path);
/*
* Here we're marking socket as non-blocking and setting its backlog
@@ -252,6 +260,7 @@
memset(&timeout, 0, sizeof(struct timespec));
kevent(retval->queue, &eventlist, 1, NULL, 0, &timeout);
+ LOG_MSG_2("runtime environment", "successfully initialized");
TRACE_OUT(init_runtime_env);
return (retval);
}
@@ -343,6 +352,8 @@
return;
} else {
/* some other error happened */
+ LOG_ERR_2("process_socket_event", "kevent error, errno"
+ " is %d", errno);
TRACE_OUT(process_socket_event);
return;
}
@@ -488,6 +499,8 @@
struct query_state *qstate;
TRACE_IN(process_timer_event);
+ LOG_MSG_2("processing_timer_event", "timer event received - "
+ "abandoning request");
qstate = (struct query_state *)event_data->udata;
destroy_query_state(qstate);
close(event_data->ident);
@@ -650,6 +663,7 @@
register_agent(s_agent_table, init_group_mp_agent());
register_agent(s_agent_table, init_services_agent());
register_agent(s_agent_table, init_services_mp_agent());
+ LOG_MSG_1("main", "request agents registered successfully");
/*
* Hosts agent can't work properly until we have access to the
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf#9 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf.5#9 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.c#9 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.h#9 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.c#9 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.h#9 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.c#9 (text+ko) ====
@@ -32,6 +32,7 @@
#include <string.h>
#include "config.h"
#include "debug.h"
+#include "log.h"
#define INITIAL_ENTRIES_CAPACITY 8
#define DEFAULT_SOCKET_PATH "/var/run/cached"
@@ -106,6 +107,8 @@
if (res != 0) {
free(retval);
pthread_mutexattr_destroy(&attr);
+ LOG_ERR_2("create_configuration_entry",
+ "can't create positive cache lock");
TRACE_OUT(create_configuration_entry);
return (NULL);
}
@@ -115,6 +118,8 @@
pthread_mutex_destroy(&retval->positive_cache_lock);
free(retval);
pthread_mutexattr_destroy(&attr);
+ LOG_ERR_2("create_configuration_entry",
+ "can't create negative cache lock");
TRACE_OUT(create_configuration_entry);
return (NULL);
}
@@ -125,6 +130,8 @@
pthread_mutex_destroy(&retval->negative_cache_lock);
free(retval);
pthread_mutexattr_destroy(&attr);
+ LOG_ERR_2("create_configuration_entry",
+ "can't create negative cache lock");
TRACE_OUT(create_configuration_entry);
return (NULL);
}
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.h#9 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.c#9 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.h#9 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/hashtable.h#9 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.c#9 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.h#9 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.c#9 (text+ko) ====
@@ -124,6 +124,8 @@
c_mp_rs_request->entry_length);
if (result != qstate->kevent_watermark) {
+ LOG_ERR_3("on_mp_read_session_request_read2",
+ "read failed");
TRACE_OUT(on_mp_read_session_request_read2);
return (-1);
}
@@ -302,6 +304,8 @@
result = qstate->write_func(qstate, &c_mp_rs_response->error_code,
sizeof(int));
if (result != sizeof(int)) {
+ LOG_ERR_3("on_mp_read_session_response_write1",
+ "write failed");
TRACE_OUT(on_mp_read_session_response_write1);
return (-1);
}
@@ -330,6 +334,8 @@
} else {
result = qstate->read_func(qstate, &elem_type, sizeof(int));
if (result != sizeof(int)) {
+ LOG_ERR_3("on_mp_read_session_mapper",
+ "read failed");
TRACE_OUT(on_mp_read_session_mapper);
return (-1);
}
@@ -348,6 +354,8 @@
default:
qstate->kevent_watermark = 0;
qstate->process_func = NULL;
+ LOG_ERR_3("on_mp_read_session_mapper",
+ "unknown element type");
TRACE_OUT(on_mp_read_session_mapper);
return (-1);
}
@@ -409,6 +417,8 @@
sizeof(size_t));
if (result != qstate->kevent_watermark) {
TRACE_OUT(on_mp_read_session_read_response_write1);
+ LOG_ERR_3("on_mp_read_session_read_response_write1",
+ "write failed");
return (-1);
}
@@ -416,6 +426,8 @@
qstate->process_func = on_mp_read_session_read_response_write2;
} else {
if (result != qstate->kevent_watermark) {
+ LOG_ERR_3("on_mp_read_session_read_response_write1",
+ "write failed");
TRACE_OUT(on_mp_read_session_read_response_write1);
return (-1);
}
@@ -440,6 +452,8 @@
result = qstate->write_func(qstate, read_response->data,
read_response->data_size);
if (result != qstate->kevent_watermark) {
+ LOG_ERR_3("on_mp_read_session_read_response_write2",
+ "write failed");
TRACE_OUT(on_mp_read_session_read_response_write2);
return (-1);
}
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.h#9 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.c#9 (text+ko) ====
@@ -90,11 +90,15 @@
&c_mp_ws_request->entry_length, sizeof(size_t));
if (result != sizeof(size_t)) {
+ LOG_ERR_3("on_mp_write_session_request_read1",
+ "read failed");
TRACE_OUT(on_mp_write_session_request_read1);
return (-1);
}
if (BUFSIZE_INVALID(c_mp_ws_request->entry_length)) {
+ LOG_ERR_3("on_mp_write_session_request_read1",
+ "invalid entry_length value");
TRACE_OUT(on_mp_write_session_request_read1);
return (-1);
}
@@ -125,6 +129,8 @@
c_mp_ws_request->entry_length);
if (result != qstate->kevent_watermark) {
+ LOG_ERR_3("on_mp_write_session_request_read2",
+ "read failed");
TRACE_OUT(on_mp_write_session_request_read2);
return (-1);
}
@@ -228,6 +234,8 @@
result = qstate->write_func(qstate, &c_mp_ws_response->error_code,
sizeof(int));
if (result != sizeof(int)) {
+ LOG_ERR_3("on_mp_write_session_response_write1",
+ "write failed");
TRACE_OUT(on_mp_write_session_response_write1);
return (-1);
}
@@ -256,6 +264,8 @@
} else {
result = qstate->read_func(qstate, &elem_type, sizeof(int));
if (result != sizeof(int)) {
+ LOG_ERR_3("on_mp_write_session_mapper",
+ "read failed");
TRACE_OUT(on_mp_write_session_mapper);
return (-1);
}
@@ -279,6 +289,8 @@
default:
qstate->kevent_watermark = 0;
qstate->process_func = NULL;
+ LOG_ERR_2("on_mp_write_session_mapper",
+ "unknown element type");
TRACE_OUT(on_mp_write_session_mapper);
return (-1);
}
@@ -303,11 +315,15 @@
sizeof(size_t));
if (result != sizeof(size_t)) {
+ LOG_ERR_3("on_mp_write_session_write_request_read1",
+ "read failed");
TRACE_OUT(on_mp_write_session_write_request_read1);
return (-1);
}
if (BUFSIZE_INVALID(write_request->data_size)) {
+ LOG_ERR_3("on_mp_write_session_write_request_read1",
+ "invalid data_size value");
TRACE_OUT(on_mp_write_session_write_request_read1);
return (-1);
}
@@ -336,6 +352,8 @@
write_request->data_size);
if (result != qstate->kevent_watermark) {
+ LOG_ERR_3("on_mp_write_session_write_request_read2",
+ "read failed");
TRACE_OUT(on_mp_write_session_write_request_read2);
return (-1);
}
@@ -387,6 +405,8 @@
result = qstate->write_func(qstate, &write_response->error_code,
sizeof(int));
if (result != sizeof(int)) {
+ LOG_ERR_3("on_mp_write_session_write_response_write1",
+ "write failed");
TRACE_OUT(on_mp_write_session_write_response_write1);
return (-1);
}
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.h#9 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.c#9 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.h#9 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.c#9 (text+ko) ====
@@ -82,6 +82,7 @@
&element->c_mp_rs_read_response);
break;
default:
+ LOG_ERR_2("init_comm_element", "invalid communication element");
TRACE_OUT(init_comm_element);
return;
}
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.h#9 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.c#9 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.h#9 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.c#9 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.h#9 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/startup/cached#4 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/src/include/pthread.h#3 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/include/pthread.h,v 1.39 2005/09/01 15:33:22 stefanf Exp $
+ * $FreeBSD: src/include/pthread.h,v 1.40 2005/10/24 05:53:54 davidxu Exp $
*/
#ifndef _PTHREAD_H_
#define _PTHREAD_H_
@@ -163,12 +163,12 @@
void pthread_cleanup_pop(int);
void pthread_cleanup_push(void (*) (void *), void *);
int pthread_condattr_destroy(pthread_condattr_t *);
+int pthread_condattr_getclock(const pthread_condattr_t *,
+ clockid_t *);
+int pthread_condattr_getpshared(const pthread_condattr_t *, int *);
int pthread_condattr_init(pthread_condattr_t *);
-int pthread_condattr_getclock(const pthread_condattr_t *,
- clockid_t *);
-int pthread_condattr_setclock(pthread_condattr_t *,
- clockid_t);
-
+int pthread_condattr_setclock(pthread_condattr_t *, clockid_t);
+int pthread_condattr_setpshared(pthread_condattr_t *, int);
int pthread_cond_broadcast(pthread_cond_t *);
int pthread_cond_destroy(pthread_cond_t *);
int pthread_cond_init(pthread_cond_t *,
@@ -190,8 +190,11 @@
int pthread_kill(pthread_t, int);
int pthread_mutexattr_init(pthread_mutexattr_t *);
int pthread_mutexattr_destroy(pthread_mutexattr_t *);
+int pthread_mutexattr_getpshared(const pthread_mutexattr_t *,
+ int *);
int pthread_mutexattr_gettype(pthread_mutexattr_t *, int *);
int pthread_mutexattr_settype(pthread_mutexattr_t *, int);
+int pthread_mutexattr_setpshared(pthread_mutexattr_t *, int);
int pthread_mutex_destroy(pthread_mutex_t *);
int pthread_mutex_init(pthread_mutex_t *,
const pthread_mutexattr_t *);
==== //depot/projects/soc2005/nsswitch_cached/src/include/pthread_np.h#2 (text+ko) ====
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/include/pthread_np.h,v 1.15 2003/01/07 21:43:30 fjoe Exp $
+ * $FreeBSD: src/include/pthread_np.h,v 1.16 2005/10/04 07:23:56 davidxu Exp $
*/
#ifndef _PTHREAD_NP_H_
#define _PTHREAD_NP_H_
@@ -57,6 +57,7 @@
int pthread_suspend_np(pthread_t);
int pthread_switch_add_np(pthread_switch_routine_t);
int pthread_switch_delete_np(pthread_switch_routine_t);
+int pthread_timedjoin_np(pthread_t, void **, const struct timespec *);
__END_DECLS
#endif
==== //depot/projects/soc2005/nsswitch_cached/src/include/signal.h#2 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)signal.h 8.3 (Berkeley) 3/30/94
- * $FreeBSD: src/include/signal.h,v 1.24 2003/03/31 23:30:41 jeff Exp $
+ * $FreeBSD: src/include/signal.h,v 1.26 2005/10/16 22:23:03 davidxu Exp $
*/
#ifndef _SIGNAL_H_
@@ -77,15 +77,8 @@
#endif
#if __POSIX_VISIBLE >= 199506 || __XSI_VISIBLE >= 600
-#if 0
-/*
- * PR: 35924
- * XXX we don't actually have these. We set _POSIX_REALTIME_SIGNALS to
- * -1 to show that we don't have them, but this symbol is not necessarily
- * in scope (in the current implementation), so we can't use it here.
- */
int sigqueue(__pid_t, int, const union sigval);
-#endif
+
struct timespec;
int sigtimedwait(const sigset_t * __restrict, siginfo_t * __restrict,
const struct timespec * __restrict);
==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/bsnmpd/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/usr.sbin/bsnmpd/bsnmpd/Makefile,v 1.11 2005/04/26 16:49:15 harti Exp $
+# $FreeBSD: src/usr.sbin/bsnmpd/bsnmpd/Makefile,v 1.12 2005/10/04 15:03:39 harti Exp $
#
# Author: Harti Brandt <harti at freebsd.org>
@@ -24,7 +24,8 @@
DEFSDIR= ${SHAREDIR}/snmp/defs
CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I. -DUSE_LIBBEGEMOT
-CFLAGS+= -DUSE_TCPWRAPPERS
+CFLAGS+= -DUSE_TCPWRAPPERS -DQUADFMT='"llu"' -DQUADXFMT='"llx"'
+CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H
DPADD= ${LIBBEGEMOT} ${LIBBSNMP}
LDADD= -lbegemot -lbsnmp -lwrap
==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/gensnmptree/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/usr.sbin/bsnmpd/gensnmptree/Makefile,v 1.3 2005/01/28 16:08:09 ru Exp $
+# $FreeBSD: src/usr.sbin/bsnmpd/gensnmptree/Makefile,v 1.4 2005/10/04 15:03:39 harti Exp $
#
# Author: Harti Brandt <harti at freebsd.org>
@@ -7,5 +7,7 @@
PROG= gensnmptree
CFLAGS+= -I${CONTRIB}/lib
+CFLAGS+= -DQUADFMT='"llu"' -DQUADXFMT='"llx"' -DHAVE_STDINT_H
+CFLAGS+= -DHAVE_INTTYPES_H
.include <bsd.prog.mk>
==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/Makefile.inc#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/usr.sbin/bsnmpd/modules/Makefile.inc,v 1.10 2005/07/22 17:18:57 kensmith Exp $
+# $FreeBSD: src/usr.sbin/bsnmpd/modules/Makefile.inc,v 1.11 2005/10/04 15:03:39 harti Exp $
SHLIB_MAJOR= 4
WARNS?= 6
@@ -8,6 +8,8 @@
SRCS+= ${MOD}_oid.h ${MOD}_tree.c ${MOD}_tree.h
CLEANFILES+= ${MOD}_oid.h ${MOD}_tree.c ${MOD}_tree.h
CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I.
+CFLAGS+= -DQUADFMT='"llu"' -DQUADXFMT='"llx"' -DHAVE_STDINT_H
+CFLAGS+= -DHAVE_INTTYPES_H
${MOD}_oid.h: ${MOD}_tree.def ${EXTRAMIBDEFS}
cat ${.ALLSRC} | gensnmptree -e ${XSYM} > ${.TARGET}
==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cdcontrol/cdcontrol.c#2 (text+ko) ====
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.c,v 1.48 2004/04/01 16:37:46 dwmalone Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.c,v 1.49 2005/10/19 15:37:43 stefanf Exp $");
#include <sys/cdio.h>
#include <sys/cdrio.h>
@@ -1130,7 +1130,7 @@
el = el_init("cdcontrol", stdin, stdout,
stderr);
hist = history_init();
- history(hist, &he, H_EVENT, 100);
+ history(hist, &he, H_SETSIZE, 100);
el_set(el, EL_HIST, history, hist);
el_set(el, EL_EDITOR, "emacs");
el_set(el, EL_PROMPT, cdcontrol_prompt);
==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lpr/lpc/lpc.c#2 (text+ko) ====
@@ -45,7 +45,7 @@
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD: src/usr.sbin/lpr/lpc/lpc.c,v 1.30 2005/02/22 02:56:42 delphij Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/lpc/lpc.c,v 1.31 2005/10/19 16:37:52 stefanf Exp $");
#include <sys/param.h>
@@ -167,7 +167,7 @@
if (!el) {
el = el_init("lpc", stdin, stdout, stderr);
hist = history_init();
- history(hist, &he, H_EVENT, 100);
+ history(hist, &he, H_SETSIZE, 100);
el_set(el, EL_HIST, history, hist);
el_set(el, EL_EDITOR, "emacs");
el_set(el, EL_PROMPT, lpc_prompt);
==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/ndp/ndp.8#2 (text+ko) ====
@@ -27,7 +27,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/usr.sbin/ndp/ndp.8,v 1.16 2005/02/09 18:04:41 ru Exp $
+.\" $FreeBSD: src/usr.sbin/ndp/ndp.8,v 1.18 2005/10/19 16:20:18 suz Exp $
.\"
.Dd May 17, 1998
.Dt NDP 8
@@ -63,7 +63,7 @@
.Op Fl nt
.Fl i
.Ar interface
-.Op Ar flags ...
+.Op Ar expressions ...
.Nm
.Op Fl nt
.Fl I Op Ar interface | Li delete
@@ -153,19 +153,20 @@
will be used as the default.
.It Fl I Li delete
The current default interface will be deleted from the kernel.
-.It Fl i Ar interface Op Ar flags ...
+.It Fl i Ar interface Op Ar expressions ...
View ND information for the specified interface.
If additional arguments
-.Ar flags
+.Ar expressions
are given,
.Nm
-sets or clears the specified flags for the interface.
-Each flag should be separated by white spaces or tab characters.
-Possible flags are as follows.
-All of the flags can begin with the
+sets or clears the flags or variables for the interface as specified in
+the expression.
+Each expression should be separated by white spaces or tab characters.
+Possible expressions are as follows.
+Some of the expressions can begin with the
special character
.Ql - ,
-which means the flag should be cleared.
+which means the flag specified in the expression should be cleared.
Note that you need
.Fl -
before
@@ -196,6 +197,31 @@
selection, see the
.Pa IMPLEMENTATION
file supplied with the KAME kit.
+.It Xo
+.Ic disabled
+.Xc
+Disable IPv6 operation on the interface.
+When disabled, the interface discards any IPv6 packets
+received on or being sent to the interface.
+In the sending case, an error of ENETDOWN will be returned to the
+application.
+This flag is typically set automatically in the kernel as a result of
+a certain failure of Duplicate Address Detection.
+While the flag can be set or cleared by hand with the
+.Nm
+command, it is not generally advisable to modify this flag manually.
+.It Xo
+.Ic basereachable=(number)
+.Xc
+Specify the BaseReachbleTimer on the interface in millisecond.
+.It Xo
+.Ic retrans=(number)
+.Xc
+Specify the RetransTimer on the interface in millisecond.
+.It Xo
+.Ic curhlim=(number)
+.Xc
+Specify the Cur Hop Limit on the interface.
.El
.It Fl n
Do not try to resolve numeric addresses to hostnames.
==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/ndp/ndp.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/usr.sbin/ndp/ndp.c,v 1.16 2004/08/07 04:27:51 imp Exp $ */
+/* $FreeBSD: src/usr.sbin/ndp/ndp.c,v 1.20 2005/10/19 16:20:18 suz Exp $ */
/* $KAME: ndp.c,v 1.104 2003/06/27 07:48:39 itojun Exp $ */
/*
@@ -142,7 +142,6 @@
void rtrlist __P((void));
void plist __P((void));
void pfx_flush __P((void));
-void rtrlist __P((void));
void rtr_flush __P((void));
void harmonize_rtr __P((void));
#ifdef SIOCSDEFIFACE_IN6 /* XXX: check SIOCGDEFIFACE_IN6 as well? */
@@ -885,22 +884,26 @@
rtm->rtm_inits = RTV_EXPIRE;
}
rtm->rtm_flags |= (RTF_HOST | RTF_STATIC);
+#if 0 /* we don't support ipv6addr/128 type proxying */
if (rtm->rtm_flags & RTF_ANNOUNCE) {
rtm->rtm_flags &= ~RTF_HOST;
rtm->rtm_addrs |= RTA_NETMASK;
}
+#endif
/* FALLTHROUGH */
case RTM_GET:
rtm->rtm_addrs |= RTA_DST;
}
#define NEXTADDR(w, s) \
if (rtm->rtm_addrs & (w)) { \
- bcopy((char *)&s, cp, sizeof(s)); cp += sizeof(s);}
+ bcopy((char *)&s, cp, sizeof(s)); cp += SA_SIZE(&s);}
NEXTADDR(RTA_DST, sin_m);
NEXTADDR(RTA_GATEWAY, sdl_m);
+#if 0 /* we don't support ipv6addr/128 type proxying */
memset(&so_mask.sin6_addr, 0xff, sizeof(so_mask.sin6_addr));
NEXTADDR(RTA_NETMASK, so_mask);
+#endif
rtm->rtm_msglen = cp - (char *)&m_rtmsg;
doit:
@@ -965,6 +968,28 @@
newflags |= (f);\
}\
} while (0)
+/*
+ * XXX: this macro is not 100% correct, in that it matches "nud" against
+ * "nudbogus". But we just let it go since this is minor.
+ */
+#define SETVALUE(f, v) \
+ do { \
+ char *valptr; \
+ unsigned long newval; \
+ v = 0; /* unspecified */ \
+ if (strncmp(cp, f, strlen(f)) == 0) { \
+ valptr = strchr(cp, '='); \
+ if (valptr == NULL) \
+ err(1, "syntax error in %s field", (f)); \
+ errno = 0; \
+ newval = strtoul(++valptr, NULL, 0); \
+ if (errno) \
+ err(1, "syntax error in %s's value", (f)); \
+ v = newval; \
+ } \
+ } while (0)
+
+ SETFLAG("disabled", ND6_IFF_IFDISABLED);
SETFLAG("nud", ND6_IFF_PERFORMNUD);
#ifdef ND6_IFF_ACCEPT_RTADV
SETFLAG("accept_rtadv", ND6_IFF_ACCEPT_RTADV);
@@ -972,13 +997,17 @@
#ifdef ND6_IFF_PREFER_SOURCE
SETFLAG("prefer_source", ND6_IFF_PREFER_SOURCE);
#endif
+ SETVALUE("basereachable", ND.basereachable);
+ SETVALUE("retrans", ND.retrans);
+ SETVALUE("curhlim", ND.chlim);
ND.flags = newflags;
- if (ioctl(s, SIOCSIFINFO_FLAGS, (caddr_t)&nd) < 0) {
- err(1, "ioctl(SIOCSIFINFO_FLAGS)");
+ if (ioctl(s, SIOCSIFINFO_IN6, (caddr_t)&nd) < 0) {
+ err(1, "ioctl(SIOCSIFINFO_IN6)");
/* NOTREACHED */
}
#undef SETFLAG
+#undef SETVALUE
}
if (!ND.initialized) {
@@ -986,6 +1015,10 @@
/* NOTREACHED */
}
+ if (ioctl(s, SIOCGIFINFO_IN6, (caddr_t)&nd) < 0) {
+ err(1, "ioctl(SIOCGIFINFO_IN6)");
+ /* NOTREACHED */
+ }
printf("linkmtu=%d", ND.linkmtu);
printf(", maxmtu=%d", ND.maxmtu);
printf(", curhlim=%d", ND.chlim);
@@ -1013,6 +1046,8 @@
printf("\nRandom ID: ");
rbuf = ND.randomid;
break;
+ default:
+ errx(1, "impossible case for tempaddr display");
}
for (j = 0; j < 8; j++)
printf("%02x", rbuf[j]);
@@ -1021,6 +1056,10 @@
#endif
if (ND.flags) {
printf("\nFlags: ");
+#ifdef ND6_IFF_IFDISABLED
+ if ((ND.flags & ND6_IFF_IFDISABLED))
+ printf("disabled ");
+#endif
if ((ND.flags & ND6_IFF_PERFORMNUD))
printf("nud ");
#ifdef ND6_IFF_ACCEPT_RTADV
@@ -1056,6 +1095,8 @@
err(1, "sysctl(ICMPV6CTL_ND6_DRLIST)");
/*NOTREACHED*/
}
+ if (l == 0)
+ return;
buf = malloc(l);
if (!buf) {
err(1, "malloc");
==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pccard/Makefile.inc#2 (text+ko) ====
@@ -1,5 +1,3 @@
-# $FreeBSD: src/usr.sbin/pccard/Makefile.inc,v 1.9 2004/12/21 09:59:45 ru Exp $
-
-NO_SHARED?= YES
+# $FreeBSD: src/usr.sbin/pccard/Makefile.inc,v 1.10 2005/10/17 15:28:25 ru Exp $
.include "../Makefile.inc"
==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/delete/main.c#2 (text+ko) ====
@@ -20,7 +20,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/delete/main.c,v 1.26 2004/06/29 18:54:47 eik Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/delete/main.c,v 1.27 2005/10/10 08:38:20 krion Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -121,7 +121,7 @@
* package name. Otherwise we've come across a trailing '/' and
* need to continue our quest.
*/
- if (isalpha(*pkgs_split) || ((MatchType == MATCH_GLOB) && \
+ if (isalnum(*pkgs_split) || ((MatchType == MATCH_GLOB) && \
strpbrk(pkgs_split, "*?[]") != NULL)) {
*argv = pkgs_split;
break;
==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/info/main.c#2 (text+ko) ====
@@ -20,7 +20,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/info/main.c,v 1.47 2004/10/18 05:34:54 obrien Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/info/main.c,v 1.48 2005/10/10 08:38:21 krion Exp $");
#include "lib.h"
#include "info.h"
@@ -240,7 +240,7 @@
* we've come across a trailing '/' and need to continue our
* quest.
*/
- if (isalpha(*pkgs_split) || ((MatchType == MATCH_GLOB) && \
+ if (isalnum(*pkgs_split) || ((MatchType == MATCH_GLOB) && \
strpbrk(pkgs_split, "*?[]") != NULL)) {
*argv = pkgs_split;
break;
==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/version/perform.c#2 (text+ko) ====
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/version/perform.c,v 1.13 2005/07/27 07:55:12 krion Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/version/perform.c,v 1.14 2005/10/10 12:35:30 krion Exp $");
#include "lib.h"
#include "version.h"
@@ -165,6 +165,10 @@
}
}
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list