ChangeLog:

	* configure.in: Remove --enable-server option.  Allways add the
	cygserver directory to $SUBDIRS.
	* configure: Regenerate.

cygwin/ChangeLog:

	Remove USE_SERVER define.  Accommodate throughout.
	* configure.in: Remove --enable-server option.
	* configure: Regenerate.
	* environ.cc: Remove CYGWIN=server setting.

cygserver/ChangeLog:

	* client.cc (allow_server): Remove variable.
	(client_request_get_version::client_request_get_version): Drop checking
	allow_server.

utils/ChangeLog:

	* passwd.c: Remove CYGWIN=server requirement from usage text.

doc/ChangeLog:

	* cygserver.sgml: Remove the "How to use the Cygserver services"
	section.
	* cygwinenv.sgml: Move "(no)server" to the removed options section.
	* faq-programming.xml: Remove CYGWIN=server requirement for running
	the Cygwin testsuite.
	* ntsec.sgml: Ditto for using `passwd -R'.

1 files changed, 1 insertions, 7 deletions

diff --git a/winsup/cygwin/setlsapwd.cc b/winsup/cygwin/setlsapwd.cc
index 1efee1dd6..7622de370 100644
--- a/winsup/cygwin/setlsapwd.cc
+++ b/winsup/cygwin/setlsapwd.cc
@@ -1,6 +1,6 @@
 /* setlsapwd.cc: Set LSA private data password for current user.
 
-   Copyright 2008 Red Hat, Inc.
+   Copyright 2008, 2009 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -22,7 +22,6 @@ details. */
 #include <stdlib.h>
 #include <wchar.h>
 
-#ifdef USE_SERVER
 /*
  * client_request_setpwd Constructor
  */
@@ -37,8 +36,6 @@ client_request_setpwd::client_request_setpwd (PUNICODE_STRING passwd)
   msglen (sizeof (_parameters.in));
 }
 
-#endif /* USE_SERVER */
-
 unsigned long
 setlsapwd (const char *passwd)
 {
@@ -74,17 +71,14 @@ setlsapwd (const char *passwd)
 	    __seterrno_from_nt_status (status);
 	  LsaClose (lsa);
 	}
-#ifdef USE_SERVER
       else if (ret)
 	{
-	  /* If that fails, ask cygserver. */
 	  client_request_setpwd request (&data);
 	  if (request.make_request () == -1 || request.error_code ())
 	    set_errno (request.error_code ());
 	  else
 	    ret = 0;
 	}
-#endif
       if (data_buf)
 	{
 	  memset (data.Buffer, 0, data.Length);