https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=d21eb90bbcadb30a00abf59dd64375601c108f96
commit d21eb90bbcadb30a00abf59dd64375601c108f96 Author: Corinna Vinschen <[email protected]> AuthorDate: Fri Jan 17 11:43:46 2025 +0100 Commit: Corinna Vinschen <[email protected]> CommitDate: Fri Jan 17 11:44:03 2025 +0100 Cygwin: doc: clarify usage of sshd vs. cygsshd When Microsoft started to claim the "sshd" service name, we had to rename our service to "cygsshd" but we never updated the docs. Make sure the docs reflect the changed service name and fix a few bumpy expression. Reported-by: Mario Emmenlauer <[email protected]> Signed-off-by: Corinna Vinschen <[email protected]> Diff: --- winsup/doc/faq-setup.xml | 2 +- winsup/doc/faq-using.xml | 8 +++++--- winsup/doc/ntsec.xml | 8 ++++---- winsup/doc/setup-net.xml | 5 +++-- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/winsup/doc/faq-setup.xml b/winsup/doc/faq-setup.xml index 15ae84c50f17..17b11c9fbfa8 100644 --- a/winsup/doc/faq-setup.xml +++ b/winsup/doc/faq-setup.xml @@ -558,7 +558,7 @@ of Cygwin is as follows: the instructions in <ulink url="https://cygwin.com/faq/faq.html#faq.setup.uninstall-service"/> for all services that you installed. Common services that might have been -installed are <literal>sshd</literal>, <literal>cron</literal>, +installed are <literal>cygsshd</literal>, <literal>cron</literal>, <literal>cygserver</literal>, <literal>inetd</literal>, <literal>apache</literal>, <literal>postgresql</literal>, and so on. </para> diff --git a/winsup/doc/faq-using.xml b/winsup/doc/faq-using.xml index 56a1d36378c4..8a4eee99f017 100644 --- a/winsup/doc/faq-using.xml +++ b/winsup/doc/faq-using.xml @@ -168,7 +168,7 @@ will slow things down tremendously if it does not exist. <answer> <para>If your service is one of those which switch the user context -(sshd, inetd, etc), then it depends on the method used to switch to +(cygsshd, inetd, etc), then it depends on the method used to switch to another user. This problem as well as its solution is described in detail in the Cygwin User's Guide, see <ulink url="https://cygwin.com/cygwin-ug-net/ntsec.html"/>. @@ -355,7 +355,9 @@ See the documentation for the option <literal>-noleaf</literal> in the man page. it has not been ported to Cygwin and has never worked. It is currently installed as part of the sh-utils, but again, it does not work. </para> -<para>You should rather install <literal>sshd</literal> and use +<para>You should rather install <literal>sshd</literal> as a service +(the service will be called <literal>cygsshd</literal> so as not to +collide with the Microsoft <literal>sshd</literal> service) and use <literal>ssh username@localhost</literal> as a <literal>su</literal> replacement. </para> @@ -535,7 +537,7 @@ running at the same time which conflict with each other. Apart from mixing executables of different Cygwin installations, this could also happen if you have one a single Cygwin installation, for example, if you update the Cygwin package without exiting <emphasis>all</emphasis> Cygwin apps (including -services like sshd) beforehand.</para> +services like cygsshd) beforehand.</para> <para>The only DLL that is sanctioned by the Cygwin project is the one that you get by running the <ulink url="https://cygwin.com/install.html";>Cygwin Setup program</ulink>, installed in a directory controlled by this program. If you have other diff --git a/winsup/doc/ntsec.xml b/winsup/doc/ntsec.xml index 687789076c0f..ae9270e6e329 100644 --- a/winsup/doc/ntsec.xml +++ b/winsup/doc/ntsec.xml @@ -687,7 +687,7 @@ startup, you may wish to consider starting <command><link linkend="using-cygserver">cygserver</link></command> first in order to take advantage of this system-wide caching. To assure that <command><link linkend="using-cygserver">cygserver</link></command> has started -prior to starting <command>sshd</command> or other Cygwin processes, you may +prior to starting <command>cygsshd</command> or other Cygwin services, you may wish to create service startup dependencies. <command><link linkend="using-cygserver">Cygserver</link></command> should probably wait for Windows TCPIP and AFD services before it starts, and then @@ -707,7 +707,7 @@ shown below. You will need an administrative prompt to run the # Delay sshd until after Cygserver has started # Again note the (odd) required space character after "depend=" - sc config sshd depend= cygserver + sc config cygsshd depend= cygserver # View the Cygserver service details @@ -2212,8 +2212,8 @@ to 3.0 tried to creat a user token from scratch using an officially undocumented function <command>NtCreateToken</command> which is now disabled.</para> -<para>So we just start the servers which have to switch the user context -(<command>sshd</command>, <command>inetd</command>, <command>cron</command>, +<para>So we just start the services which have to switch the user context +(<command>cygsshd</command>, <command>inetd</command>, <command>cron</command>, ...) as Windows services under the SYSTEM (or LocalSystem in the GUI) account and everything just works. Unfortunately that's too simple. Using <literal>S4U</literal> has a drawback.</para> diff --git a/winsup/doc/setup-net.xml b/winsup/doc/setup-net.xml index db39bb66c8ae..4475a622d1f0 100644 --- a/winsup/doc/setup-net.xml +++ b/winsup/doc/setup-net.xml @@ -94,8 +94,9 @@ or <literal>Just Me</literal> should always be left on the default <literal>All Users</literal>, unless you do not have write access to <literal>HKEY_LOCAL_MACHINE</literal> in the registry or the All Users Start Menu. This is true even if you are the only user planning to use Cygwin -on the machine. Selecting <literal>Just Me</literal> will cause problems -for programs such as <command>crond</command> and <command>sshd</command>. +on the machine. Note that selecting <literal>Just Me</literal> will cause +problems for Cygwin applications running as service, such as +<command>crond</command> or <command>sshd</command>. If you do not have the necessary permissions, but still want to use these programs, consult the Cygwin mailing list archives about others' experiences.
