Attachment #698 for bug #915

Lines 979-985 do_setup_env(Session s, const char she Link Here

(-)session.c (-1 / +7 lines)
979	* The Windows environment contains some setting which are	979	* The Windows environment contains some setting which are
980	* important for a running system. They must not be dropped.	980	* important for a running system. They must not be dropped.
981	*/	981	*/
982	copy_environment(environ, &env, &envsize);	982	{
		983	char **p;
		984
		985	p = fetch_windows_environment();
		986	copy_environment(p, &env, &envsize);
		987	free_windows_environment(p);
		988	}
983	#endif	989	#endif
984		990
985	#ifdef GSSAPI	991	#ifdef GSSAPI




#include <sys/utsname.h>
#include <sys/vfs.h>
#include <windows.h>
#include "xmalloc.h"
#define is_winnt       (GetVersion() < 0x80000000)

#define ntsec_on(c)	((c) && strstr((c),"ntsec") && !strstr((c),"nontsec"))

	 */
	if (!inited) {
		struct utsname uts;
		char *c;
		
		if (!uname(&uts)) {
			int major_high = 0, major_low = 0, minor = 0;

		GetProcAddress(kerneldll, "RegisterServiceProcess")))
		return;
	RegisterServiceProcess(0, 1);
}

#define NL(x) x, (sizeof (x) - 1)
#define WENV_SIZ (sizeof (wenv_arr) / sizeof (wenv_arr[0]))

static struct wenv {
	const char *name;
	size_t namelen;
} wenv_arr[] = {
	{ NL("ALLUSERSPROFILE=") },
	{ NL("COMMONPROGRAMFILES=") },
	{ NL("COMPUTERNAME=") },
	{ NL("COMSPEC=") },
	{ NL("NUMBER_OF_PROCESSORS=") },
	{ NL("OS=") },
	{ NL("PATH=") },
	{ NL("PATHEXT=") },
	{ NL("PROCESSOR_ARCHITECTURE=") },
	{ NL("PROCESSOR_IDENTIFIER=") },
	{ NL("PROCESSOR_LEVEL=") },
	{ NL("PROCESSOR_REVISION=") },
	{ NL("PROGRAMFILES=") },
	{ NL("SYSTEMDRIVE=") },
	{ NL("SYSTEMROOT=") },
	{ NL("TMP=") },
	{ NL("TEMP=") },
	{ NL("WINDIR=") },
};

char **
fetch_windows_environment(void)
{
	char **e, **p;
	int i, idx = 0;

	p = xmalloc(WENV_SIZ * sizeof(char *));
	p[idx] = NULL;
	for (e = environ; *e; ++e) {
		for (i = 0; i < WENV_SIZ; ++i) {
			if (!strncmp(*e, wenv_arr[i].name,
				     wenv_arr[i].namelen)) {
				p[idx] = *e;
				p[++idx] = NULL;
			}
		}
	}
	return p;
}

void
free_windows_environment(char **p)
{
	xfree(p);
}

#endif /* HAVE_CYGWIN */

Lines 46-51 int binary_pipe(int fd[2]); Link Here

(-)openbsd-compat/bsd-cygwin_util.h (+2 lines)
46	int check_nt_auth(int, struct passwd *);	46	int check_nt_auth(int, struct passwd *);
47	int check_ntsec(const char *);	47	int check_ntsec(const char *);
48	void register_9x_service(void);	48	void register_9x_service(void);
		49	char **fetch_windows_environment(void);
		50	void free_windows_environment(char **);
49		51
50	#define open binary_open	52	#define open binary_open
51	#define pipe binary_pipe	53	#define pipe binary_pipe

Return to bug 915

Lines 38-43 RCSID("$Id: bsd-cygwin_util.c,v 1.12 200 Link Here

(-)openbsd-compat/bsd-cygwin_util.c (-1 / +54 lines)
38	#include <sys/utsname.h>	38	#include <sys/utsname.h>
39	#include <sys/vfs.h>	39	#include <sys/vfs.h>
40	#include <windows.h>	40	#include <windows.h>
		41	#include "xmalloc.h"
41	#define is_winnt (GetVersion() < 0x80000000)	42	#define is_winnt (GetVersion() < 0x80000000)
42		43
43	#define ntsec_on(c) ((c) && strstr((c),"ntsec") && !strstr((c),"nontsec"))	44	#define ntsec_on(c) ((c) && strstr((c),"ntsec") && !strstr((c),"nontsec"))
Lines 96-102 has_capability(int what) Link Here
96	*/	97	*/
97	if (!inited) {	98	if (!inited) {
98	struct utsname uts;	99	struct utsname uts;
99	char *c;
100		100
101	if (!uname(&uts)) {	101	if (!uname(&uts)) {
102	int major_high = 0, major_low = 0, minor = 0;	102	int major_high = 0, major_low = 0, minor = 0;
Lines 234-239 register_9x_service(void) Link Here
234	GetProcAddress(kerneldll, "RegisterServiceProcess")))	234	GetProcAddress(kerneldll, "RegisterServiceProcess")))
235	return;	235	return;
236	RegisterServiceProcess(0, 1);	236	RegisterServiceProcess(0, 1);
		237	}
		238
		239	#define NL(x) x, (sizeof (x) - 1)
		240	#define WENV_SIZ (sizeof (wenv_arr) / sizeof (wenv_arr[0]))
		241
		242	static struct wenv {
		243	const char *name;
		244	size_t namelen;
		245	} wenv_arr[] = {
		246	{ NL("ALLUSERSPROFILE=") },
		247	{ NL("COMMONPROGRAMFILES=") },
		248	{ NL("COMPUTERNAME=") },
		249	{ NL("COMSPEC=") },
		250	{ NL("NUMBER_OF_PROCESSORS=") },
		251	{ NL("OS=") },
		252	{ NL("PATH=") },
		253	{ NL("PATHEXT=") },
		254	{ NL("PROCESSOR_ARCHITECTURE=") },
		255	{ NL("PROCESSOR_IDENTIFIER=") },
		256	{ NL("PROCESSOR_LEVEL=") },
		257	{ NL("PROCESSOR_REVISION=") },
		258	{ NL("PROGRAMFILES=") },
		259	{ NL("SYSTEMDRIVE=") },
		260	{ NL("SYSTEMROOT=") },
		261	{ NL("TMP=") },
		262	{ NL("TEMP=") },
		263	{ NL("WINDIR=") },
		264	};
		265
		266	char **
		267	fetch_windows_environment(void)
		268	{
		269	char e, p;
		270	int i, idx = 0;
		271
		272	p = xmalloc(WENV_SIZ * sizeof(char *));
		273	p[idx] = NULL;
		274	for (e = environ; *e; ++e) {
		275	for (i = 0; i < WENV_SIZ; ++i) {
		276	if (!strncmp(*e, wenv_arr[i].name,
		277	wenv_arr[i].namelen)) {
		278	p[idx] = *e;
		279	p[++idx] = NULL;
		280	}
		281	}
		282	}
		283	return p;
		284	}
		285
		286	void
		287	free_windows_environment(char **p)
		288	{
		289	xfree(p);
237	}	290	}
238		291
239	#endif /* HAVE_CYGWIN */	292	#endif /* HAVE_CYGWIN */