Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sysoptions.h: move keepalive string above ident #302

Closed
wants to merge 1 commit into from

Conversation

M95D
Copy link
Contributor

@M95D M95D commented May 15, 2024

OpenWrt package removes Dropbear version from ident string. Until now, that was done with sed, instead of a patch. I'm trying to change that to a patch.

I noticed that the version string is defined only 3 lines above the ident string. A normal patch would include the version line. Any version change would invalidate the patch.

To keep the version string outside the patch. I moved the keepalive string just above the ident string, as these are somewhat related.

If you don't like this PR, an alternative would be to add a comment-description of the ident string. That would also push the the version string outside the patch.

Thanks.

OpenWrt package removes Dropbear version from ident string.
Until now, that was done with sed, instead of a patch.

I'm trying to change that to a patch and I noticed that the version string
is defined only 3 lines above the ident string. A normal patch would
include that line. Any version change would invalidate the patch.

I moved the keepalive string just above the ident string,
as these are somewhat related. That will keep the version string outside
the patch.

Signed-off-by: Marius Dinu <m95d+git@psihoexpert.ro>
@mkj
Copy link
Owner

mkj commented May 15, 2024

I think I'd prefer something like

/* IDENT_VERSION is the optional part after "SSH-2.0-dropbear". Refer to RFC4253 for requirements */ 
#ifndef IDENT_VERSION_PART
#define IDENT_VERSION_PART "_" DROPBEAR_VERSION
#endif

#define LOCAL_IDENT "SSH-2.0-dropbear" IDENT_VERSION_PART

Then you could put #define IDENT_VERSION_PART "_OpenWRT" or whatever you want in build/localoptions.h (or src/distrooptions.h now too)

@M95D M95D closed this May 16, 2024
@M95D M95D deleted the m95d-sysoptions branch May 16, 2024 07:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants