[oe] [PATCH][meta-networking] inetutils: fix tcpd path of rlogin rsh and rexec

[Rongqing Li]

On 2015年07月15日 22:36, Joe MacDonald wrote:
> [[oe] [PATCH][meta-networking] inetutils: fix tcpd path of rlogin rsh and rexec] On 15.07.06 (Mon 16:56) rongqing.li at windriver.com wrote:
>
>> From: Jian Liu <jian.liu at windriver.com>
>>
>> rlogin, rsh and rexec xinet.d script, a wrong path is
>> being referenced under the server section.
>
> This seems like a sensible update, but rather than just shifting this
> around, can you update this patch to do something a bit more robust?
> I'm thinking along the lines of what the other servers do (and what's
> being done everywhere for systemd now):
>
>   73 do_install () {
>   [...]
>   95     sed -e 's, at BASE_SBINDIR@,${base_sbindir},g' \
>   96         -e 's, at SYSCONFDIR@,${sysconfdir},g' \
>   97         -e 's, at SBINDIR@,${sbindir},g' \
>   98         -i ${D}${systemd_unitdir}/system/*.service
>
> (source: meta-networking/recipes-daemons/proftpd/proftpd_1.3.5a.bb, etc.)
>
> So sed in the proper values of $(sbindir) (since that's where tcpd is
> installed by the tcp-wrappers recipe) after installing a template xinetd
> file.
>
> -J.

Ok, will send v2

-Roy

>
>>
>> server = /usr/bin/tcpd
>> instead of
>> server = /usr/sbin/tcpd
>>
>> tcpd is provided by tcp-wrappers
>>
>> Written-by: Herve.Patriarche <herve.patriarche at windriver.com>
>> Signed-off-by: Jian Liu <jian.liu at windriver.com>
>> ---
>>   .../inetutils/inetutils-1.9.2/rexec.xinetd.inetutils                    | 2 +-
>>   .../inetutils/inetutils-1.9.2/rlogin.xinetd.inetutils                   | 2 +-
>>   .../recipes-connectivity/inetutils/inetutils-1.9.2/rsh.xinetd.inetutils | 2 +-
>>   3 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rexec.xinetd.inetutils b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rexec.xinetd.inetutils
>> index 80aed36..7354360 100644
>> --- a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rexec.xinetd.inetutils
>> +++ b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rexec.xinetd.inetutils
>> @@ -14,7 +14,7 @@ service exec
>>   	group		= root
>>   	log_on_success	+= USERID
>>   	log_on_failure	+= USERID
>> -	server		= /usr/bin/tcpd
>> +	server		= /usr/sbin/tcpd
>>   	server_args	= /usr/sbin/in.rexecd
>>   	disable		= yes
>>   }
>> diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rlogin.xinetd.inetutils b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rlogin.xinetd.inetutils
>> index 00dbf93..70493e6 100644
>> --- a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rlogin.xinetd.inetutils
>> +++ b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rlogin.xinetd.inetutils
>> @@ -14,7 +14,7 @@ service login
>>   	group		= root
>>   	log_on_success	+= USERID
>>   	log_on_failure	+= USERID
>> -	server		= /usr/bin/tcpd
>> +	server		= /usr/sbin/tcpd
>>   	server_args	= /usr/sbin/in.rlogind -a
>>   	disable		= yes
>>   }
>> diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rsh.xinetd.inetutils b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rsh.xinetd.inetutils
>> index ad59b62..a842eb9 100644
>> --- a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rsh.xinetd.inetutils
>> +++ b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rsh.xinetd.inetutils
>> @@ -15,7 +15,7 @@ service shell
>>   	group		= root
>>   	log_on_success	+= USERID
>>   	log_on_failure	+= USERID
>> -	server		= /usr/bin/tcpd
>> +	server		= /usr/sbin/tcpd
>>   	server_args	= /usr/sbin/in.rshd -aL
>>   	disable		= yes
>>   }

-- 
Best Reagrds,
Roy | RongQing Li