starlingx/gplv2
Code Issues Proposed changes

Fix malformed patch on cgcs-users/ibsh

Browse Source 
The cgcs-users patches started to fail after the tarball download
was enabled. This was because the indentation is different in the
downloaded source code.

In the past, ibsh was get from an internal repository and presumably
this source code was modified before get checked in into the repo.

Change-Id: I0b36bedc35a6002bd596c0d2bd6729ccb37285ae
Signed-off-by: Erich Cordoba <erich.cordoba.malibran@intel.com>
This commit is contained in:
Erich Cordoba 2018-07-09 16:01:50 -07:00
parent 67202ded0a
commit e243ee6e61
1 changed files with 48 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cgcs-users/cgcs-users-1.0/ibsh-0.3e-cgcs.patch
View File

@ -55,12 +55,11 @@ Index: cgcs-users-1.0-r0/main.c
for ( ; ; ) { for ( ; ; ) {
/* Where is he ? */ /* Where is he ? */
getcwd(real_path, STRING_SIZE); getcwd(real_path, STRING_SIZE);
@@ -153,12 +171,14 @@ int main(int argc, char **argv) @@ -153,12 +171,12 @@ int main(int argc, char **argv)
} }
/* We don't want the user to know where he actually is. */ /* We don't want the user to know where he actually is. */
/* This is the prompt! */ /* This is the prompt! */
- printf("[%s]%% ", jail_path); - printf("[%s]%% ", jail_path);
+ //printf("[%s]%% ", jail_path);
+ printf("[%s]%% ", loggedin.uname); + printf("[%s]%% ", loggedin.uname);
/* scanf("%s", user_command); */ /* scanf("%s", user_command); */
myscanf(user_command, real_path); myscanf(user_command, real_path);
@ -68,7 +67,6 @@ Index: cgcs-users-1.0-r0/main.c
/* Command interpretation and execution. */ /* Command interpretation and execution. */
if ( (CommandOK(user_command, loggedin.udir, jail_path, filtered_command)) == 0 ) { if ( (CommandOK(user_command, loggedin.udir, jail_path, filtered_command)) == 0 ) {
- printf("Sorry, can't let you do that!\n"); - printf("Sorry, can't let you do that!\n");
+ //printf("Sorry, can't let you do that!\n");
log_attempt(loggedin.uname); /* v0.2a */ log_attempt(loggedin.uname); /* v0.2a */
continue; continue;
} }
@ -76,12 +74,11 @@ Index: cgcs-users-1.0-r0/config.c
=================================================================== ===================================================================
--- cgcs-users-1.0-r0.orig/config.c --- cgcs-users-1.0-r0.orig/config.c
+++ cgcs-users-1.0-r0/config.c +++ cgcs-users-1.0-r0/config.c
@@ -166,7 +166,7 @@ int LoadConfig( void ) @@ -166,7 +166,6 @@ int LoadConfig( void )
// Delete '\n' // Delete '\n'
tmp2[i][strlen(tmp2[i]) - 1] = '\0'; tmp2[i][strlen(tmp2[i]) - 1] = '\0';
strncpy(extensions[i],tmp2[i],strlen(tmp2[i])); strncpy(extensions[i],tmp2[i],strlen(tmp2[i]));
- printf("EXTENSIONS %s\n",extensions[i]); - printf("EXTENSIONS %s\n",extensions[i]);
+ //printf("EXTENSIONS %s\n",extensions[i]);
i++; i++;
} }
} }